backend/server/importlib/importLib.py | 7 +++++++ backend/server/importlib/packageImport.py | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-)
New commits: commit 9c9f63cb3ddd3c43212f934255145180dbe2218b Author: Michael Mraka michael.mraka@redhat.com Date: Fri Oct 30 09:50:08 2009 +0100
fixed errata sync part of satellite-sync
diff --git a/backend/server/importlib/importLib.py b/backend/server/importlib/importLib.py index 856fe58..dbfde10 100644 --- a/backend/server/importlib/importLib.py +++ b/backend/server/importlib/importLib.py @@ -676,6 +676,11 @@ class GenericPackageImport(Import): if not self.package_arches.has_key(package.arch): self.package_arches[package.arch] = None
+ # 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
def _postprocessPackageNEVRA(self, package): arch = self.package_arches[package.arch] @@ -697,6 +702,8 @@ class GenericPackageImport(Import): package['name_id'], package['evr_id'], package['package_arch_id'] = nevra package['nevra_id'] = nevra_dict[nevra]
+ def _postprocessPackage(self, package): + package['checksum_id'] = self.checksums[package['checksum']]
# Exceptions class ImportException(Exception): diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py index 8c4932a..a2fca26 100644 --- a/backend/server/importlib/packageImport.py +++ b/backend/server/importlib/packageImport.py @@ -71,7 +71,8 @@ class ChannelPackageSubscription(GenericPackageImport): if package.ignored: continue self._postprocessPackageNEVRA(package) - package['checksum_id'] = self.checksums[package['checksum']] + #package['checksum_id'] = self.checksums[package['checksum']] + self._postprocessPackage(package) if not CFG.ENABLE_NVREA: # nvrea disabled, skip md5sum nevrao = ( @@ -179,11 +180,11 @@ 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 +# # 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):