diff options
author | Christian Goetze <cg@lindenlab.com> | 2009-05-21 20:59:56 +0000 |
---|---|---|
committer | Christian Goetze <cg@lindenlab.com> | 2009-05-21 20:59:56 +0000 |
commit | 77c1e2b761b2d7321e9c5f39e716e769c3a2effd (patch) | |
tree | e4fcc50b701c30dac43dce297114c8421708ca95 /indra | |
parent | fb309e781eaa5f31805ab1589b0706a97509c5be (diff) |
Fix develop.py putenv bug, use new etch build-linux hosts for parabuild.
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/develop.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/develop.py b/indra/develop.py index f670c66639..1398bca935 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -385,7 +385,7 @@ class LinuxSetup(UnixSetup): distcc_dir = os.path.join(getcwd(), '.distcc') if not os.path.exists(distcc_dir): os.mkdir(distcc_dir) - os.putenv('DISTCC_DIR', distcc_dir) + os.environ['DISTCC_DIR'] = distcc_dir if job_count is None: hosts, job_count = count_distcc_hosts() @@ -393,10 +393,10 @@ class LinuxSetup(UnixSetup): hostname = socket.gethostname() if hostname.startswith('station'): hosts, job_count = mk_distcc_hosts('station', 36, 2) - os.putenv('DISTCC_HOSTS', hosts) + os.environ['DISTCC_HOSTS'] = hosts if hostname.startswith('eniac'): hosts, job_count = mk_distcc_hosts('eniac', 71, 2) - os.putenv('DISTCC_HOSTS', hosts) + os.environ['DISTCC_HOSTS'] = hosts if job_count > 12: job_count = 12; opts.extend(['-j', str(job_count)]) |