summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2016-07-15 11:48:25 -0700
committerJoshua Harlow <harlowja@gmail.com>2016-07-15 11:48:25 -0700
commit35b902c05711c8637999ad3fb72d5e04aae36dad (patch)
tree61c67f66d06b4981d85603d2d4da4fcf48adf4da /packages
parent333eea5105956c978043579a49d935af6d3ceff2 (diff)
downloadvyos-cloud-init-35b902c05711c8637999ad3fb72d5e04aae36dad.tar.gz
vyos-cloud-init-35b902c05711c8637999ad3fb72d5e04aae36dad.zip
Avoid depending on argparse in 2.7 or greater
Its not needed since its a built-in for these versions so we can just skip it for any newer rpm building in the first place. LP: #1603533
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/brpm3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/brpm b/packages/brpm
index b41b675f..45e47610 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -137,6 +137,9 @@ def generate_spec_contents(args, tmpl_fn, top_dir, arc_fn):
# 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"