cloud-init-dev team mailing list archive

[Joshua Harlow <harlowja@xxxxxxxxx>]

Joshua Harlow has proposed merging lp:~harlowja/cloud-init/cloud-init-fix-rpm-argparse into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1603533 in cloud-init: "Can't build correctly using brpm on cent7"
  https://bugs.launchpad.net/cloud-init/+bug/1603533

For more details, see:
https://code.launchpad.net/~harlowja/cloud-init/cloud-init-fix-rpm-argparse/+merge/300235
-- 
Your team cloud init development team is requested to review the proposed merge of lp:~harlowja/cloud-init/cloud-init-fix-rpm-argparse into lp:cloud-init.

=== modified file 'packages/brpm'
--- packages/brpm	2015-05-19 12:16:46 +0000
+++ packages/brpm	2016-07-15 18:49:45 +0000
@@ -137,6 +137,9 @@
     # Map to known packages
     requires = []
     for p in pkgs:
+        if p == 'argparse' and sys.version_info[0:2] >= (2, 7):
+            # Not needed on anything but 2.6 or older.
+            continue
         tgt_pkg = PKG_MP[args.distro].get(p)
         if not tgt_pkg:
             raise RuntimeError(("Do not know how to translate pypi dependency"