diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2009-08-13 15:20:12 +0000 |
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2009-08-13 15:20:12 +0000 |
| commit | c58c61be8d6c19aae13b0fd67f0242ddc4d65086 (patch) | |
| tree | 85d52a70f5806577b798429b5ddd0431f25d5724 /Tools | |
| parent | ef0c3920987d9c40f5a39f5ecfc9a82f855b48d2 (diff) | |
| download | ports-c58c61be8d6c19aae13b0fd67f0242ddc4d65086.tar.gz ports-c58c61be8d6c19aae13b0fd67f0242ddc4d65086.zip | |
Make sure that some options to dopackages are passed to the environment
when invoking pdispatch.
Notes
Notes:
svn path=/head/; revision=239452
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/portbuild/scripts/packagebuild | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Tools/portbuild/scripts/packagebuild b/Tools/portbuild/scripts/packagebuild index e0b73e0624b5..b1ae97ed7859 100755 --- a/Tools/portbuild/scripts/packagebuild +++ b/Tools/portbuild/scripts/packagebuild @@ -396,18 +396,22 @@ class worker(threading.Thread): else: print try: + runenv={'HOME':"/root", + 'PATH':'/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/var/portbuild/scripts', + 'FD':" ".join(["%s.tbz" % p.name for p in pkg.fdep]), + 'ED':" ".join(["%s.tbz" % p.name for p in pkg.edep]), + 'PD':" ".join(["%s.tbz" % p.name for p in pkg.pdep]), + 'BD':" ".join(["%s.tbz" % p.name for p in pkg.bdep]), + 'RD':" ".join(["%s.tbz" % p.name for p in pkg.rdep])} + for var in ["NOCLEAN", "NO_RESTRICTED", "NOPLISTCHECK", "NO_DISTFILES", "FETCH_ORIGINAL", "TRYBROKEN" ]: + if var in os.environ: + runenv[var] = os.environ.get(var) build = subprocess.Popen( ["/bin/sh", "/var/portbuild/scripts/pdispatch", self.arch, self.branch, self.buildid, self.machine, "/var/portbuild/scripts/portbuild", "%s.tbz" % pkg.name, pkg.path], - env={'HOME':"/root", - 'PATH':'/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/var/portbuild/scripts', - 'FD':" ".join(["%s.tbz" % p.name for p in pkg.fdep]), - 'ED':" ".join(["%s.tbz" % p.name for p in pkg.edep]), - 'PD':" ".join(["%s.tbz" % p.name for p in pkg.pdep]), - 'BD':" ".join(["%s.tbz" % p.name for p in pkg.bdep]), - 'RD':" ".join(["%s.tbz" % p.name for p in pkg.rdep])}, + env=runenv, stderr=subprocess.STDOUT, stdout=subprocess.PIPE, bufsize=0) except OSError, e: print >>sys.stderr, "[%s:%s]: Execution failed: %s" % \ |