backend/server/handlers/config/rhn_config_management.py | 14 +++++++-------
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit efc183149c56be42916f33047a246dfad1bc8df8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 28 10:54:16 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.6.44-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index e129c88..9efa795 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 and Python
-Version: 1.6.43
+Version: 1.6.44
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -675,6 +675,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Nov 28 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.44-1
+- having a table twice in select is mostly a bug
+
* Fri Nov 25 2011 Miroslav Suchý 1.6.43-1
- Ubuntu send request for translations, send 404 back and do not raise
traceback (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index c7f0bda..be283f1 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.43-1 backend/
+1.6.44-1 backend/
commit 79e57d3b215340a54e911a073408f0eb7c6afc1f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 28 10:47:06 2011 +0100
having a table twice in select is mostly a bug
fixing commit 1e64dc4546d96c58dd84a88c3c634b2d2ce164a4
diff --git a/backend/server/handlers/config/rhn_config_management.py
b/backend/server/handlers/config/rhn_config_management.py
index 8eebd93..c8c42db 100644
--- a/backend/server/handlers/config/rhn_config_management.py
+++ b/backend/server/handlers/config/rhn_config_management.py
@@ -174,11 +174,11 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
_query_client_get_file = rhnSQL.Statement("""
select :path path,
cc.label config_channel,
- ccont.contents file_contents,
- ccont.is_binary is_binary,
+ c.contents file_contents,
+ c.is_binary is_binary,
c.checksum_type,
c.checksum,
- ccont.delim_start, ccont.delim_end,
+ c.delim_start, c.delim_end,
cr.revision,
cf.modified,
ci.username,
@@ -194,14 +194,14 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
from rhnConfigChannel cc,
rhnConfigInfo ci,
rhnConfigRevision cr
- left join rhnConfigContent ccont
- on cr.config_content_id = ccont.id
left join
- (select cs.id, cs.checksum_type, cs.checksum
+ (select ccont.id, cs.checksum_type, cs.checksum,
+ ccont.contents, ccont.is_binary,
+ ccont.delim_start, ccont.delim_end
from rhnChecksumView cs
inner join rhnConfigContent ccont
on ccont.checksum_id = cs.id) c
- on c.id = ccont.checksum_id,
+ on cr.config_content_id = c.id,
rhnServerConfigChannel scc,
rhnConfigFile cf,
rhnConfigFileType cft,