diff options
author | Joseph Hunkeler <jhunkeler@gmail.com> | 2013-04-19 19:12:48 -0400 |
---|---|---|
committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2013-04-19 19:12:48 -0400 |
commit | 3ac42a8e14f3cb3f704e15a3382f045cadc185e3 (patch) | |
tree | 39348fb24e9c7a28e9a7ee79c00845f5f2e67cbf /ipsutils/build.py | |
parent | 7255e30dda1daaa14a44e1c9e3c17da85f57f84b (diff) | |
download | ipsutils-3ac42a8e14f3cb3f704e15a3382f045cadc185e3.tar.gz |
Fix err return check; stdout now points to a file
Diffstat (limited to 'ipsutils/build.py')
-rw-r--r-- | ipsutils/build.py | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/ipsutils/build.py b/ipsutils/build.py index 1f8b65b..e987eaf 100644 --- a/ipsutils/build.py +++ b/ipsutils/build.py @@ -158,16 +158,18 @@ class Build(env.Environment): 'generate', self.env_pkg['BUILDPROTO']] command_pkgfmt = [self.tool['pkgfmt']] + fp = file(self.env_meta['FILES'], 'w+') proc_pkg = subprocess.Popen(command_pkg, stdout=subprocess.PIPE) proc_pkgfmt = subprocess.Popen(command_pkgfmt, stdin=proc_pkg.stdout, - stdout=self.env_meta['FILES']) + stdout=fp) output, err = proc_pkgfmt.communicate() + fp.close() if output: for line in output: print(line.rstrip('\n')) - if err != 0: + if err is not None: return False return True @@ -177,16 +179,18 @@ class Build(env.Environment): self.env_meta['FILES'], self.env_meta['METADATA']] command_pkgfmt = [self.tool['pkgfmt']] + fp = file(self.env_meta['TRANS'], 'w+') proc_pkg = subprocess.Popen(command_pkg, stdout=subprocess.PIPE) proc_pkgfmt = subprocess.Popen(command_pkgfmt, stdin=proc_pkg.stdout, - stdout=self.env_meta['TRANS']) + stdout=fp) output, err = proc_pkgfmt.communicate() + fp.close() if output: for line in output: print(line.rstrip('\n')) - if err != 0: + if err is not None: return False return True @@ -197,27 +201,29 @@ class Build(env.Environment): self.env_pkg['BUILDPROTO'], self.env_meta['TRANS']] command_pkgfmt = [self.tool['pkgfmt']] + fp = file(self.env_meta['DEPENDS'], 'w+') proc_pkg = subprocess.Popen(command_pkg, stdout=subprocess.PIPE) proc_pkgfmt = subprocess.Popen(command_pkgfmt, stdin=proc_pkg.stdout, - stdout=self.env_meta['DEPENDS']) + stdout=fp) output, err = proc_pkgfmt.communicate() + fp.close() if output: for line in output: print(line.rstrip('\n')) - if err != 0: + if err is not None: return False return True - def manifest_depends_resolve(self): + def manifest_depends_resolve(self, *p): command_pkg = [self.tool['pkgdepend'], 'resolve', '-m', self.env_meta['DEPENDS']] proc_pkg = subprocess.Popen(command_pkg) err = proc_pkg.wait() - if err != 0: + if err is not None: return False return True |