backend/server/importlib/packageImport.py | 6 ++++--
backend/server/rhnServer/server_solarispatches.py | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit b12b12adefb8be0aef220dfbcba95a73b18ff89b
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Mon Dec 14 16:17:30 2009 -0500
Fix typo preventing Solaris up2date from working
diff --git a/backend/server/rhnServer/server_solarispatches.py
b/backend/server/rhnServer/server_solarispatches.py
index 90aa112..6edd351 100644
--- a/backend/server/rhnServer/server_solarispatches.py
+++ b/backend/server/rhnServer/server_solarispatches.py
@@ -27,7 +27,7 @@ def get_package_id(pkg):
"""Lookup a package id from rhnPackage in the database,
Return the id or return None if the package is not found"""
- p = dbPackage(entry)
+ p = dbPackage(pkg)
query = """SELECT id FROM rhnPackage
WHERE name_id=LOOKUP_PACKAGE_NAME(:name)
commit 059099214308373e472b40a1ad6aedc61c4a98c0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 14 16:47:15 2009 +0100
fixed import of pre-sha256 satellite/hosted exports
diff --git a/backend/server/importlib/packageImport.py
b/backend/server/importlib/packageImport.py
index b7975d0..cb89e06 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -252,14 +252,16 @@ 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 = (checksum_type, f['filedigest'])
+ if 'md5' in f: # old pre-sha256 export
+ fchecksum = ('md5', f['md5'])
+ else:
+ fchecksum = (f['checksum_type'], f['checksum'])
f['checksum'] = fchecksum
if not self.checksums.has_key(fchecksum):
self.checksums[fchecksum] = None
Show replies by date