sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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
commit c597e99f4e
1 changed files with 2 additions and 2 deletions
Show stats 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:
map_output = subprocess.check_output(
pkg_map_args, stderr=subprocess.STDOUT)
pkg_map_args)
except subprocess.CalledProcessError as e:
if e.returncode == 1:
if args.noop:
pkgs.append(pkg)
continue
else:
print("pkg-map failed with error %s" % e.output)
print("pkg-map failed")
sys.exit(1)
elif e.returncode == 2:
pkgs.append(pkg)