refactor env handling for FDroidPopen to support .fdroid.* metadata

The start up sequence of processes that are based on the .fdroid.* metadata
is a bit different, so this ensures that the environment variables get
properly initialized in all cases.

This also creates a single function where the environment is set.  Before
it was being set in multiple places across multiple files.
This commit is contained in:
Hans-Christoph Steiner 2015-08-05 14:39:58 +02:00
parent 9abb80b3b7
commit 3768d7a4d6
6 changed files with 47 additions and 24 deletions

View file

@ -64,7 +64,7 @@ class CommonTest(unittest.TestCase):
def testIsApkDebuggable(self):
config = dict()
config['sdk_path'] = os.getenv('ANDROID_HOME')
fdroidserver.common.fill_config_defaults(config)
fdroidserver.common.config = config
self._set_build_tools()
config['aapt'] = fdroidserver.common.find_sdk_tools_cmd('aapt')