backend/server/importlib/headerSource.py | 3 ++-
backend/server/importlib/packageImport.py | 18 ++++++------------
2 files changed, 8 insertions(+), 13 deletions(-)
New commits:
commit 150e16697ad6cf3b38b6e4dd62d2bf40e85ecfdb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Nov 20 00:10:07 2009 +0100
fixed checksum type of files inside rpm package
diff --git a/backend/server/importlib/headerSource.py
b/backend/server/importlib/headerSource.py
index 4773d58..5bc1d36 100644
--- a/backend/server/importlib/headerSource.py
+++ b/backend/server/importlib/headerSource.py
@@ -282,7 +282,8 @@ class rpmFile(File, ChangeLog):
'rdev' : 'filerdevs',
'file_size' : 'filesizes',
'mtime' : 'filemtimes',
- 'md5' : 'filemd5s',
+ 'filedigest' : 'filemd5s', # FILEMD5S is a pre-rpm4.6 name
for FILEDIGESTS
+ # we have to use it for compatibility reason
'linkto' : 'filelinktos',
'flags' : 'fileflags',
'verifyflags' : 'fileverifyflags',
diff --git a/backend/server/importlib/packageImport.py
b/backend/server/importlib/packageImport.py
index e0c82f7..5044c84 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -253,13 +253,14 @@ class PackageImport(ChannelPackageSubscription):
self.capabilities[nv] = None
# Process files too
fileList = package['files']
+ checksum_type = package['checksum'][0]
for f in fileList:
nv = (f['name'], '')
del f['name']
f['capability'] = nv
if not self.capabilities.has_key(nv):
self.capabilities[nv] = None
- fchecksum = ('md5', f['md5'])
+ fchecksum = (checksum_type, f['filedigest'])
f['checksum'] = fchecksum
if not self.checksums.has_key(fchecksum):
self.checksums[fchecksum] = None
@@ -486,7 +487,7 @@ class PackageImport(ChannelPackageSubscription):
package['solaris_patch_set_members'] = infoObjs
def _comparePackages(self, package1, package2):
- if package1['md5sum'] == package2['md5sum']:
+ if package1['checksum'] == package2['checksum']:
return
# XXX Handle this better
raise Exception("Different packages in the same batch")
@@ -552,7 +553,7 @@ class SourcePackageImport(Import):
def _comparePackages(self, package1, package2):
- if package1['md5sum'] == package2['md5sum']:
+ if package1['checksum'] == package2['checksum']:
return
# XXX Handle this better
raise Exception("Different packages in the same batch")
commit eba05941e8a324731c2d929ee2f4303297f6e436
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 23:40:45 2009 +0100
removed commented out code
diff --git a/backend/server/importlib/packageImport.py
b/backend/server/importlib/packageImport.py
index b102925..e0c82f7 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -71,7 +71,6 @@ class ChannelPackageSubscription(GenericPackageImport):
if package.ignored:
continue
self._postprocessPackageNEVRA(package)
- #package['checksum_id'] =
self.checksums[package['checksum']]
self._postprocessPackage(package)
if not CFG.ENABLE_NVREA:
# nvrea disabled, skip checksum
@@ -180,12 +179,6 @@ class ChannelPackageSubscription(GenericPackageImport):
# Replace the channel list with the uniquified list
package.channels = channels
-# # FIXME: needs to be fixed for sha256
-# checksum = ('md5',package['md5sum'])
-# package['checksum'] = checksum
-# if not self.checksums.has_key(checksum):
-# self.checksums[checksum] = None
-
# Copies the channels from one package to the other
def __copyChannels(self, sourcePackage, destPackage):
dpHash = destPackage['channels']
commit ae0a3a61985c4e0300468d404b8dbc718bc7f018
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 23:39:06 2009 +0100
fixed comment
diff --git a/backend/server/importlib/packageImport.py
b/backend/server/importlib/packageImport.py
index 036bdab..b102925 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -74,14 +74,14 @@ class ChannelPackageSubscription(GenericPackageImport):
#package['checksum_id'] =
self.checksums[package['checksum']]
self._postprocessPackage(package)
if not CFG.ENABLE_NVREA:
- # nvrea disabled, skip md5sum
+ # nvrea disabled, skip checksum
nevrao = (
package['name_id'],
package['evr_id'],
package['package_arch_id'],
package['org_id'])
else:
- # As nvrea is enabled uniquify based on md5sum
+ # As nvrea is enabled uniquify based on checksum
nevrao = (
package['name_id'],
package['evr_id'],
Show replies by date