diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-08-21 21:19:02 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-08-21 21:19:02 +0000 |
| commit | 869f3f2cc0fabdb46e2e0863d830b7d8525c13ee (patch) | |
| tree | 4ceb9c464e2fa4006e3f59900cad9793120a4927 /src/lib/Client | |
| parent | 24cbd14e9e764d30e6065e9a7c796525ab87022d (diff) | |
| download | bcfg2-869f3f2cc0fabdb46e2e0863d830b7d8525c13ee.tar.gz bcfg2-869f3f2cc0fabdb46e2e0863d830b7d8525c13ee.tar.bz2 bcfg2-869f3f2cc0fabdb46e2e0863d830b7d8525c13ee.zip | |
SYSV: Fix noask use (Patch via HCoyote)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5413 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client')
| -rw-r--r-- | src/lib/Client/Tools/SYSV.py | 6 | ||||
| -rw-r--r-- | src/lib/Client/Tools/YUMng.py | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/lib/Client/Tools/SYSV.py b/src/lib/Client/Tools/SYSV.py index 1c20ea76f..146ce7967 100644 --- a/src/lib/Client/Tools/SYSV.py +++ b/src/lib/Client/Tools/SYSV.py @@ -31,10 +31,10 @@ class SYSV(Bcfg2.Client.Tools.PkgTool): def __init__(self, logger, setup, config): Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config) - noaskfile = tempfile.NamedTemporaryFile() - self.noaskname = noaskfile.name + self.noaskfile = tempfile.NamedTemporaryFile() + self.noaskname = self.noaskfile.name try: - noaskfile.write(noask) + self.noaskfile.write(noask) self.pkgtool = (self.pkgtool[0] % ("-a %s" % (self.noaskname)), \ self.pkgtool[1]) except: diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py index b30d6cdcc..d119df36d 100644 --- a/src/lib/Client/Tools/YUMng.py +++ b/src/lib/Client/Tools/YUMng.py @@ -115,10 +115,12 @@ class YUMng(Bcfg2.Client.Tools.RPMng.RPMng): # installed but out of date data.update(self.yum_avail[entry.get('name')]) for (arch, (epoch, vers, rel)) in list(data.items()): - Bcfg2.Client.XML.SubElement(entry, "Instance", - name=entry.get('name'), - version=vers, arch=arch, - release=rel, epoch=epoch) + x= Bcfg2.Client.XML.SubElement(entry, "Instance", + name=entry.get('name'), + version=vers, arch=arch, + release=rel, epoch=epoch) + if 'verify_flags' in entry.attrib: + x.set('verify_flags', entry.get('verify_flags')) return Bcfg2.Client.Tools.RPMng.RPMng.VerifyPackage(self, entry, modlist) |