java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 4 ++--
java/conf/cobbler/snippets/keep_system_id | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit bb3183abcf9d69bba1092d8104c456b2e3e996f7
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Oct 26 08:31:36 2010 -0400
fixing broken if statement in snippet
diff --git a/java/conf/cobbler/snippets/keep_system_id
b/java/conf/cobbler/snippets/keep_system_id
index d092cac..721cd7e 100644
--- a/java/conf/cobbler/snippets/keep_system_id
+++ b/java/conf/cobbler/snippets/keep_system_id
@@ -6,7 +6,7 @@ rhn_keys_found=no
insmod /lib/jbd.o
insmod /lib/ext3.o
-if [ -f /lib/ext4.o ];
+if [ -f /lib/ext4.o ]; then
insmod /lib/ext4.o
fi
commit 4d1eda5bf877d5cb0aec7ae68e08423b52a00f79
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Oct 26 08:31:21 2010 -0400
fixing broken query used by SSM System delete
query would return all columns in rhnServer instead of just the two we need
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index eee8d89..fa417ef 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1252,8 +1252,8 @@ ORDER BY SERVER_ID
WHERE ST.user_id = :user_id
AND ST.label = :set_label
AND ST.element = S.id
- ) X, rhnServer S
-ORDER BY UPPER(NVL(S.name, '(none)')), S.id
+ ) X
+ORDER BY UPPER(NVL(name, '(none)')), id
</query>
<mode name="virtual_systems_in_set"
class="com.redhat.rhn.frontend.dto.VirtualSystemOverview">
Show replies by date