openstack/deb-python-diskimage-builder
Code Issues Proposed changes

Merge "Ignore stderr from pkg-map"

Browse Source
This commit is contained in:
Jenkins
2015-01-06 21:20:18 +00:00
committed by Gerrit Code Review
parent ef0c043c85 da7787069d
commit c597e99f4e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
elements/package-installs/bin/package-installs-v2
View File

@@ -55,14 +55,14 @@ def main():
try: try:
map_output = subprocess.check_output( map_output = subprocess.check_output(
pkg_map_args, stderr=subprocess.STDOUT) pkg_map_args)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
if e.returncode == 1: if e.returncode == 1:
if args.noop: if args.noop:
pkgs.append(pkg) pkgs.append(pkg)
continue continue
else: else:
print("pkg-map failed with error %s" % e.output) print("pkg-map failed")
sys.exit(1) sys.exit(1)
elif e.returncode == 2: elif e.returncode == 2:
pkgs.append(pkg) pkgs.append(pkg)