diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-09 14:46:48 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-09 14:46:48 -0500 |
| commit | c3aeaece258ee61ff3c463a66e55f597f5978efb (patch) | |
| tree | d747c4bc50a3796d206b3670d7bde375e9996ec1 | |
| parent | db9f633b6d123aefef6d5efeb8605517a7d5759d (diff) | |
| parent | ed65a7d8bc85f219dbeda7d6261671fbdc2172aa (diff) | |
Merge remote-tracking branch 'chiiph/fixenv'
| -rw-r--r-- | lib/thandy/packagesys/ThpPackages.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/thandy/packagesys/ThpPackages.py b/lib/thandy/packagesys/ThpPackages.py index 4afebbe..af66b80 100644 --- a/lib/thandy/packagesys/ThpPackages.py +++ b/lib/thandy/packagesys/ThpPackages.py @@ -324,15 +324,15 @@ class ThpPackage(object): if "scripts" in self._metadata: if "python2" in self._metadata['scripts']: for script in self._metadata['scripts']['python2']: - env = {} + env = os.environ.copy() env['THP_PACKAGE_NAME'] = self._metadata['package_name'] env['THP_OLD_VERSION'] = "" env['THP_NEW_VERSION'] = self._metadata['package_version'] env['THP_OLD_INSTALL_ROOT'] = "" env['THP_INSTALL_ROOT'] = os.getenv("THP_INSTALL_ROOT") env['THP_JSON_FILE'] = json_file - env['THP_VERBOSE'] = 1 - env['THP_PURGE'] = 0 + env['THP_VERBOSE'] = "1" + env['THP_PURGE'] = "0" env['THP_TEMP_DIR'] = self._tmp_path sw = ScriptWrapper(os.path.join(self._tmp_path, "meta", @@ -388,7 +388,7 @@ class ScriptWrapper(object): """ Wrapper for the scripts in the Thp package. """ def __init__(self, path = None, env = None): self._path = path - self._env = None + self._env = env def run(self): """ Abstracts how a script is executed. In this case, another |