backend/server/importlib/packageImport.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
New commits: commit 2905144fee9eaf79ad17c40767c652e836245614 Author: Michael Mraka michael.mraka@redhat.com Date: Fri Feb 4 14:25:30 2011 +0100
674528 - don't read signatures when there is no rpm (--no-rpms)
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py index f57fd30..b1b675b 100644 --- a/backend/server/importlib/packageImport.py +++ b/backend/server/importlib/packageImport.py @@ -480,11 +480,12 @@ class PackageImport(ChannelPackageSubscription):
def _import_signatures(self): for package in self.batch: - full_path = os.path.join(CFG.MOUNT_POINT, package['path']) - if os.path.exists(full_path): - header = rhn_rpm.get_package_header(filename=full_path) - server_packages.processPackageKeyAssociations(header, - package['checksum_type'], package['checksum']) + if package['path']: + full_path = os.path.join(CFG.MOUNT_POINT, package['path']) + if os.path.exists(full_path): + header = rhn_rpm.get_package_header(filename=full_path) + server_packages.processPackageKeyAssociations(header, + package['checksum_type'], package['checksum'])
class SourcePackageImport(Import): def __init__(self, batch, backend, caller=None, update_last_modified=0):
spacewalk-commits@lists.fedorahosted.org