openstack/diskimage-builder
Code Issues Proposed changes

Merge "Make some pkg-map errors soft"

Browse Source
This commit is contained in:
Jenkins 2014-11-25 02:57:09 +00:00 committed by Gerrit Code Review
commit 47b58526e7
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
elements/pkg-map/bin/pkg-map
View File

@ -20,6 +20,11 @@ import os
import sys import sys
def eprint(msg):
sys.stderr.write(msg)
sys.stderr.write("\n")
def os_family(distro): def os_family(distro):
family = None family = None
if distro in ['fedora', 'rhel', 'rhel7', 'centos7']: if distro in ['fedora', 'rhel', 'rhel7', 'centos7']:
@ -34,26 +39,32 @@ def os_family(distro):
def main(): def main():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description="Translate package name to distro specific name.") description="Translate package name to distro specific name."
" Exits with 1 if error is encountered, 2 if no pkg-map"
" file is found. Otherwise exits with 0.")
parser.add_argument('--element', default='', parser.add_argument('--element', default='',
help='The element (namespace) to use for translation.') help='The element (namespace) to use for translation.')
parser.add_argument('--distro', default=os.environ.get('DISTRO_NAME'), parser.add_argument('--distro', default=os.environ.get('DISTRO_NAME'),
help='The distro name to use for translation.' help='The distro name to use for translation.'
' Defaults to DISTRO_NAME') ' Defaults to DISTRO_NAME')
parser.add_argument('--missing-ok', action="store_true",
help='Do not consider missing mappings an error.'
' Causes packages where no mapping is set to be'
' printed.')
args, extra = parser.parse_known_args() args, extra = parser.parse_known_args()
if not args.element: if not args.element:
print('Please specify an --element argument.') eprint('Please specify an --element argument.')
sys.exit(1) sys.exit(1)
if not args.distro: if not args.distro:
print('Please specify a --distro argument or set DISTRO_NAME.') eprint('Please specify a --distro argument or set DISTRO_NAME.')
sys.exit(1) sys.exit(1)
map_file = '/usr/share/pkg-map/%s' % args.element map_file = '/usr/share/pkg-map/%s' % args.element
if not os.path.exists(map_file): if not os.path.exists(map_file):
print('Map file for %s element does not exist.' % args.element) eprint('Map file for %s element does not exist.' % args.element)
sys.exit(1) sys.exit(2)
with open(map_file) as fd: with open(map_file) as fd:
package_names = json.loads(fd.read()) package_names = json.loads(fd.read())
@ -93,6 +104,7 @@ def main():
distro_map = package_names['distro'].get(args.distro) distro_map = package_names['distro'].get(args.distro)
if distro_map: if distro_map:
name_map.update(distro_map) name_map.update(distro_map)
for name in extra: for name in extra:
pkg_name = name_map.get(name) pkg_name = name_map.get(name)
if pkg_name: if pkg_name:
@ -101,7 +113,10 @@ def main():
continue continue
else: else:
err_msg = 'Missing package name for distro/element: %s/%s' err_msg = 'Missing package name for distro/element: %s/%s'
print(err_msg % (args.distro, args.element)) eprint(err_msg % (args.distro, args.element))
if args.missing_ok:
print(name)
else:
sys.exit(1) sys.exit(1)
sys.exit(0) sys.exit(0)