backend/server/handlers/app/packages.py | 10 +++++-----
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 30161d150daf33faf40ea28356993f1cb0176031
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 26 13:52:36 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.41-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 0e99669..8aec5c0 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.40
+Version: 1.8.41
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -646,6 +646,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Jun 26 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.41-1
+- 833686 - don't open file if path is None
+
* Tue Jun 26 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.40-1
- removed dead code backend.listChannel()
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 97d91c2..780e499 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.40-1 backend/
+1.8.41-1 backend/
commit be337700d59bd4fc4165d552f7bb43c6a0a9cf3b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 26 13:47:52 2012 +0200
833686 - don't open file if path is None
diff --git a/backend/server/handlers/app/packages.py
b/backend/server/handlers/app/packages.py
index aa2ca68..7ed5a7e 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -310,7 +310,7 @@ class Packages(RPC_Base):
package['checksum'] = package['md5sum']
exec_args = {
- 'pkg_name': package['name'],
+ 'name': package['name'],
'pkg_epoch': package['epoch'],
'pkg_version': package['version'],
'pkg_rel': package['release'],
@@ -425,7 +425,7 @@ class Packages(RPC_Base):
rhnPackageArch pa,
rhnChecksumView c
where
- pn.name = :pkg_name
+ pn.name = :name
and ( pe.epoch = :pkg_epoch or
( pe.epoch is null and :pkg_epoch is null )
)
@@ -459,7 +459,7 @@ class Packages(RPC_Base):
pkg_epoch = str(pkg_epoch)
query_args = {
- 'pkg_name': pkg_info['name'],
+ 'name': pkg_info['name'],
'pkg_epoch': pkg_epoch,
'pkg_version': str(pkg_info['version']),
'pkg_rel': str(pkg_info['release']),
@@ -486,7 +486,7 @@ class Packages(RPC_Base):
row = h.fetchone_dict()
if not row:
ret = ''
- elif row.has_key('path'):
+ elif row.get('path'):
filePath = os.path.join(CFG.MOUNT_POINT, row['path'])
if os.access(filePath, os.R_OK):
if row.has_key('checksum'):
@@ -498,7 +498,7 @@ class Packages(RPC_Base):
log_error("Package not found", filePath)
ret = ''
else:
- log_error("Package path null for package", filePath)
+ log_error("Package path null for package",
query_args['name'])
ret = ''
return ret