From 0c6203116be9e8ef17327cd49436b013e677b8f5 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Wed, 5 Jul 2006 20:01:37 +0000 Subject: Patch to suppress mtime verify failures (from Jason Pepas) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1909 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Redhat.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/Client/Redhat.py b/src/lib/Client/Redhat.py index e980ad9c1..3eb3b2a6e 100644 --- a/src/lib/Client/Redhat.py +++ b/src/lib/Client/Redhat.py @@ -91,6 +91,10 @@ class ToolsetImpl(Toolset): if not entry.get('version'): self.logger.error("Can't install package %s, not enough data." % (entry.get('name'))) return False + rpm_options = [] + if entry.get('verify', 'false') == 'nomtime': + self.logger.debug("Skipping mtime verification for package %s" % (entry.get('name'))) + rpm_options.append("--nomtime") if self.installed.has_key(entry.get('name')): if entry.get('version') == self.installed[entry.get('name')]: if entry.get('multiarch'): @@ -120,7 +124,7 @@ class ToolsetImpl(Toolset): entry.set('current_exists', 'false') return False - (vstat, output) = self.saferun("rpm --verify -q %s-%s" % (entry.get('name'), entry.get('version'))) + (vstat, output) = self.saferun("rpm --verify -q %s %s-%s" % (" ".join(rpm_options), entry.get('name'), entry.get('version'))) if vstat != 0: if [name for name in output if name.split()[-1] not in modlist]: self.logger.debug("Package %s content verification failed" % entry.get('name')) -- cgit v1.2.3-1-g7c22