diff options
| author | Jason Pepas <cell@ices.utexas.edu> | 2006-07-21 15:45:31 +0000 |
|---|---|---|
| committer | Jason Pepas <cell@ices.utexas.edu> | 2006-07-21 15:45:31 +0000 |
| commit | f74a2d07136831eda27553bc8682de846e65014f (patch) | |
| tree | 672c08759b7d2b679c7b2d31953d38f237efa9c2 /tools/rpmlisting.py | |
| parent | 52aff1b8760498a8d18d252f5aad6f57df7a19b1 (diff) | |
| download | bcfg2-f74a2d07136831eda27553bc8682de846e65014f.tar.gz bcfg2-f74a2d07136831eda27553bc8682de846e65014f.tar.bz2 bcfg2-f74a2d07136831eda27553bc8682de846e65014f.zip | |
Updated rpmlisting.py to remove verify="nomtime" option for multiarch packages. the redhat client no longer verifies *any* multiarch packages, so setting verify=nomtime is no longer needed.
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1988 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'tools/rpmlisting.py')
| -rw-r--r-- | tools/rpmlisting.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/rpmlisting.py b/tools/rpmlisting.py index f2dc47fec..543293edf 100644 --- a/tools/rpmlisting.py +++ b/tools/rpmlisting.py @@ -197,8 +197,7 @@ def scan_rpm_dir(rpmdir, uri, group, priority=0, output=sys.stdout): pattern_string = '\.(%s)\.rpm$' % '|'.join(archs) # e.g., '\.(i386|x86_64)\.rpm$' pattern = re.compile(pattern_string) multiarch_file = pattern.sub('.%(arch)s.rpm', rpmblob['file']) # e.g., 'foo-1.0-1.%(arch)s.rpm' - # hack! we must include verify="nomtime" for all multiarch packages on a fedora system. - output.write(' <Package name="%s" file="%s" version="%s-%s" multiarch="%s" verify="nomtime"/>\n' % + output.write(' <Package name="%s" file="%s" version="%s-%s" multiarch="%s"/>\n' % (rpmblob['name'], multiarch_file, rpmblob['version'], rpmblob['release'], multiarch_string)) output.write(' </Group>\n') output.write('</PackageList>\n') |