java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 3 ++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit fc3e272e3f1e552b6bdd9903783811a57ea3bb29
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jul 13 11:19:57 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.109-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f5aae5b..e174858 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.108
+Version: 1.8.109
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jul 13 2012 Stephen Herr <sherr(a)redhat.com> 1.8.109-1
+- 833474 - quick file list query now also returns files saved to system's
+ 'local' config 'channel'
+
* Fri Jul 13 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.108-1
- struts jars may be available in different directories
- Show XCCDF-diff icon on the XCCDF-Details page.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5df0ca2..467fc4f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.108-1 java/
+1.8.109-1 java/
commit 869eb498001de015249d0395529a172728d33954
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jul 13 11:19:49 2012 -0400
833474 - quick file list query now also returns files saved to system's
'local' config 'channel'
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
index 5f71e50..6793874 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
@@ -1312,7 +1312,8 @@ select cc.label as config_channel_label,
AND CCT.label != 'server_import'
group by cf.config_file_name_id) tmp
where tmp.id = cfn.id
- and scc.position = tmp.position
+ and (scc.position = tmp.position
+ or (scc.position is null and tmp.position is null))
and scc.config_channel_id = cc.id
and scc.server_id = :sid
and cc.confchan_type_id = cct.id