backend/server/handlers/app/packages.py | 4 ++--
backend/server/importlib/packageImport.py | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit b561351b9a9e02fc4c279198462cd4e21ac0d733
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 2 15:53:27 2011 +0200
701297 - don't try to read rpm header from mpm package
diff --git a/backend/server/importlib/packageImport.py
b/backend/server/importlib/packageImport.py
index effd477..f8f5bef 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -21,6 +21,7 @@ import os.path
from importLib import GenericPackageImport, IncompletePackage, \
Import, InvalidArchError, InvalidChannelError, \
IncompatibleArchError
+from mpmSource import mpmBinaryPackage
from spacewalk.common import rhn_pkg
from spacewalk.common.rhnConfig import CFG
from spacewalk.server import taskomatic
@@ -481,7 +482,8 @@ class PackageImport(ChannelPackageSubscription):
def _import_signatures(self):
for package in self.batch:
- if package['path']:
+ # skip missing files and mpm packages
+ if package['path'] and not isinstance(package, mpmBinaryPackage):
full_path = os.path.join(CFG.MOUNT_POINT, package['path'])
if os.path.exists(full_path):
header = rhn_pkg.get_package_header(filename=full_path)
commit b8e79b43306d0a80ac5130870a1b0521a24e1db0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Sun May 1 22:07:32 2011 +0200
force version and release to be a string
fixing
operator does not exist: character varying = integer
diff --git a/backend/server/handlers/app/packages.py
b/backend/server/handlers/app/packages.py
index e3aa1b1..7b24bb1 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -509,8 +509,8 @@ class Packages(RPC_Base):
query_args = {
'pkg_name': pkg_info['name'],
'pkg_epoch': pkg_epoch,
- 'pkg_version': pkg_info['version'],
- 'pkg_rel': pkg_info['release'],
+ 'pkg_version': str(pkg_info['version']),
+ 'pkg_rel': str(pkg_info['release']),
'pkg_arch': pkg_info['arch'],
'orgid': org_id,
}
Show replies by thread