Merge lp:~ltrager/maas-images/bootloaders_proposed into lp:maas-images

[Lee Trager]

Add --proposed to import command for bootloaders.

Output of meph2-import --proposed bootloaders.yaml bootloaders-proposed

http://162.213.35.187/bootloaders-proposed/

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'meph2/commands/dpkg.py'
--- meph2/commands/dpkg.py	2016-08-24 20:40:23 +0000
+++ meph2/commands/dpkg.py	2018-04-09 19:55:25 +0000
@@ -102,7 +102,9 @@
     return ret == 0
 
 
-def get_package(archive, pkg_name, architecture, release=None, dest=None):
+def get_package(
+        archive, pkg_name, architecture, release=None, dest=None,
+        proposed=False):
     """Look through the archives for package metadata. If a dest is given
     download the package.
 
@@ -112,7 +114,10 @@
     release = get_distro_release() if release is None else release
     package = None
     # Find the latest version of the package
-    for dist in ('%s-updates' % release, '%s-security' % release, release):
+    dists = ('%s-updates' % release, '%s-security' % release, release)
+    if proposed:
+        dists = ('%s-proposed' % release,) + dists
+    for dist in dists:
         base_url = '%s/dists/%s' % (archive, dist)
         packages = get_packages(base_url, architecture, pkg_name)
         if pkg_name in packages:
@@ -218,11 +223,12 @@
 
 def extract_files_from_packages(
         archive, packages, architecture, files, release, target, path,
-        grub_format=None, grub_config=None, grub_output=None):
+        grub_format=None, grub_config=None, grub_output=None, proposed=False):
     tmp = tempfile.mkdtemp(prefix='maas-images-')
     src_packages = []
     for package in packages:
-        package = get_package(archive, package, architecture, release, tmp)
+        package = get_package(
+            archive, package, architecture, release, tmp, proposed=proposed)
         pkg_path = os.path.join(tmp, os.path.basename(package['Filename']))
         if pkg_path is None:
             sys.stderr.write('%s not found in archives!' % package)

=== modified file 'meph2/commands/mimport.py'
--- meph2/commands/mimport.py	2017-05-02 07:31:59 +0000
+++ meph2/commands/mimport.py	2018-04-09 19:55:25 +0000
@@ -97,8 +97,9 @@
         src_packages = {}
         for package in firmware_platform['packages']:
             package_info = get_package(
-                firmware_platform['archive'], package,
-                firmware_platform['arch'], firmware_platform['release'])
+                archive=firmware_platform['archive'], pkg_name=package,
+                architecture=firmware_platform['arch'],
+                release=firmware_platform['release'], proposed=args.proposed)
             # Some source packages include the package version in the source
             # name. Only take the name, not the version.
             src_package_name = package_info['Source'].split(' ')[0]
@@ -167,7 +168,7 @@
             firmware_platform['arch'], firmware_platform['files'],
             firmware_platform['release'], args.target, path, grub_format,
             firmware_platform.get('grub_config'),
-            firmware_platform.get('grub_output'))
+            firmware_platform.get('grub_output'), args.proposed)
         product_tree['products'][product_id]['versions'][version] = {
             'items': items
         }
@@ -308,6 +309,9 @@
             args = [args]
         parser.add_argument(*args, **kwargs)
     parser.set_defaults(action=main_import)
+    parser.add_argument(
+        '--proposed', help='Pull bootloaders from proposed',
+        action='store_true', default=False)
 
     args = parser.parse_args()
     if not getattr(args, 'action', None):