From 7fd3480596b2499365c1223e47e96428bda5a6be Mon Sep 17 00:00:00 2001 From: Garrett Holmstrom Date: Wed, 21 Jun 2017 15:00:48 -0700 Subject: [PATCH] Fix NameError in package module https://git.launchpad.net/cloud-init/commit/?id=a3daf184fd47dede8d91588281437453bd38fc1c https://bugzilla.redhat.com/show_bug.cgi?id=1447708 --- ....8-dnf.patch => cloud-init-0.7.9-dnf.patch | 25 ++++++++++--------- cloud-init.spec | 8 ++++-- 2 files changed, 19 insertions(+), 14 deletions(-) rename cloud-init-0.7.8-dnf.patch => cloud-init-0.7.9-dnf.patch (51%) diff --git a/cloud-init-0.7.8-dnf.patch b/cloud-init-0.7.9-dnf.patch similarity index 51% rename from cloud-init-0.7.8-dnf.patch rename to cloud-init-0.7.9-dnf.patch index 5b9d5db..cf47010 100644 --- a/cloud-init-0.7.8-dnf.patch +++ b/cloud-init-0.7.9-dnf.patch @@ -1,8 +1,8 @@ -diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py -index aa55838..0d47693 100644 ---- a/cloudinit/distros/rhel.py -+++ b/cloudinit/distros/rhel.py -@@ -190,13 +190,17 @@ class Distro(distros.Distro): +Index: cloud-init-0.7.9/cloudinit/distros/rhel.py +=================================================================== +--- cloud-init-0.7.9.orig/cloudinit/distros/rhel.py ++++ cloud-init-0.7.9/cloudinit/distros/rhel.py +@@ -190,13 +190,18 @@ class Distro(distros.Distro): if pkgs is None: pkgs = [] @@ -13,15 +13,16 @@ index aa55838..0d47693 100644 - # installed; yum won't error out complaining that baz is already - # installed. - cmd.append("-t") -+ if os.path.isfile('/usr/bin/dnf'): -+ LOG.debug('Using dnf for package management') ++ if util.which('dnf'): ++ LOG.debug('Using DNF for package management') + cmd = ['dnf'] + else: -+ LOG.debug('Using yum for package management') -+ # If enabled, then yum will be tolerant of errors on the command line -+ # with regard to packages. -+ # For example: if you request to install foo, bar and baz and baz is -+ # installed; yum won't error out complaining that baz is already ++ LOG.debug('Using YUM for package management') ++ # the '-t' argument makes yum tolerant of errors on the command ++ # line with regard to packages. ++ # ++ # For example: if you request to install foo, bar and baz and baz ++ # is installed; yum won't error out complaining that baz is already + # installed. + cmd = ['yum', '-t'] # Determines whether or not yum prompts for confirmation diff --git a/cloud-init.spec b/cloud-init.spec index cca277d..0bead2f 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 0.7.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cloud instance init scripts License: GPLv3 URL: http://launchpad.net/cloud-init @@ -24,7 +24,8 @@ Patch3: cloud-init-0.7.9-ecdsa.patch # Use dnf instead of yum when available # https://bugzilla.redhat.com/show_bug.cgi?id=1194451 -Patch7: cloud-init-0.7.8-dnf.patch +# https://git.launchpad.net/cloud-init/commit/?id=a3daf184fd47dede8d91588281437453bd38fc1c +Patch7: cloud-init-0.7.9-dnf.patch # Skip apt-source tests that are sensitive to the system's hostname # https://bugs.launchpad.net/cloud-init/+bug/1629149 @@ -228,6 +229,9 @@ nosetests-%{python3_version} tests/unittests/ %changelog +* Wed Jun 21 2017 Garrett Holmstrom - 0.7.9-6 +- Fixed NameError in package module [RH:1447708] + * Fri Apr 14 2017 Garrett Holmstrom - 0.7.9-5 - Made DigitalOcean DNS server handling consistent with OpenStack [RH:1442463, LP:1675571] - Improved handling of multiple NICs on DigitalOcean [RH:1442463]