backend/server/rhnPackage.py | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit df7a200a07b42a3e60d8a6ffe6b0d2cdb3071fed
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 28 14:18:21 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.7.35-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index fa98bc9..22eb7de 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.7.34
+Version: 1.7.35
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -687,6 +687,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Feb 28 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.7.35-1
+- fixed 'speeded up searching whether package is already synced'
+
* Tue Feb 28 2012 Jan Pazdziora 1.7.34-1
- Avoid vn_rhnpackageevr_epoch violation.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index d04c345..1e7c541 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.7.34-1 backend/
+1.7.35-1 backend/
commit 6197300f6fb8fa94aa089ba9f1837868710c3285
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 28 14:16:08 2012 +0100
fixed 'speeded up searching whether package is already synced'
fixing
Traceback (most recent call last):
File "/usr/bin/spacewalk-repo-sync", line 100, in <module>
...
File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnPackage.py",
line 336, in get_info_for_package
h.execute(**params)
File
"/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/sql_base.py", line
163, in execute
return apply(self._execute_wrapper, (self._execute, ) + p, kw)
File
"/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_cx_Oracle.py",
line 108, in _execute_wrapper
retval = apply(function, p, kw)
File
"/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/sql_base.py", line
217, in _execute
return self._execute_(args, kwargs)
File
"/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_cx_Oracle.py",
line 161, in _execute_
self._real_cursor.execute(*(None, ), **params)
spacewalk.server.rhnSQL.sql_base.SQLStatementPrepareError: ('ORA-00904:
"C"."LABEL": invalid identifier\n', 904, 'select p.path,
cp.channel_id, cv.checksum_type, cv.checksum from rhnPackage p join rhnPackageName pn on
p.name_id = pn.id join rhnPackageEVR pe on p.evr_id = pe.id join rhnPackageArch pa on
p.package_arch_id = pa.id left join rhnChannelPackage cp on p.id = cp.package_id and
cp.channel_id = :channel_id join rhnChecksumView cv on p.checksum_id = cv.id where pn.name
= :name and pe.version = :ver and pe.release = :rel and (epoch is null or epoch = :epoch)
and pa.label = :arch order by c.label nulls last')
introduced in commit b01266b6f68df0863b78878171448aa833435b87
diff --git a/backend/server/rhnPackage.py b/backend/server/rhnPackage.py
index 3b3b511..89b7d39 100644
--- a/backend/server/rhnPackage.py
+++ b/backend/server/rhnPackage.py
@@ -330,7 +330,7 @@ def get_info_for_package(pkg, channel_id):
and pe.release = :rel
and %s
and pa.label = :arch
- order by c.label nulls last
+ order by cp.channel_id nulls last
""" % epochStatement
h = rhnSQL.prepare(statement)
h.execute(**params)