rel-eng/packages utils/spacewalk-utils.spec
by Grant Gainey
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit a9565a64a7a4eb346a2a218a6f61790a49995dce
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Fri Sep 27 09:36:47 2013 -0400
Automatic commit of package [spacewalk-utils] release [2.1.18-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 428f858..d3220d2 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-2.1.17-1 utils/
+2.1.18-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 7a2d97f..18e0bab 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 2.1.17
+Version: 2.1.18
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -88,6 +88,10 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Fri Sep 27 2013 Grant Gainey <ggainey(a)redhat.com> 2.1.18-1
+- 1012963 - Don't use :table as a param-name in Oracle prepared stmts
+- 1012934 - Oracle prepared-stmt cannot have semicolons
+
* Fri Sep 20 2013 Grant Gainey <ggainey(a)redhat.com> 2.1.17-1
- 1009657 - fixes spacewalk-hostname-rename issue when postgres and oracle are
installed
10 years, 7 months
2 commits - utils/spacewalk-archive-audits
by Grant Gainey
utils/spacewalk-archive-audits | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 795e173c6c7a26288203740170a48ed692e72e5c
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Fri Sep 27 09:34:45 2013 -0400
1012963 - Don't use :table as a param-name in Oracle prepared stmts
diff --git a/utils/spacewalk-archive-audits b/utils/spacewalk-archive-audits
index 42dffdf..32a4b7f 100755
--- a/utils/spacewalk-archive-audits
+++ b/utils/spacewalk-archive-audits
@@ -49,7 +49,7 @@ LOG_COLS = ['id', 'stamp', 'user_id']
SQL_PIECES = {'oracle': {
'COUNT' : 'select count(*) from %(table)s',
- 'FIND_COLS' : "select column_name from user_tab_columns where table_name = :table",
+ 'FIND_COLS' : "select column_name from user_tab_columns where table_name = :the_table",
'FIND_TABLE' : "select table_name from user_tables where table_name like '%|_LOG' escape '|'",
'GET_DATA' : "select %(cols)s, %(tcols)s from %(tname)s t inner join log l on l.id = t.log_id where l.stamp <= to_date(:tstamp, 'YYYY-MM-DD hh24:mi:ss') order by l.id",
'PURGE_DATA' : """
@@ -65,7 +65,7 @@ SQL_PIECES = {'oracle': {
},
'postgresql' : {
'COUNT' : 'select count(*) from %(table)s;',
- 'FIND_COLS' : 'select column_name from information_schema.columns where table_name = :table;',
+ 'FIND_COLS' : 'select column_name from information_schema.columns where table_name = :the_table;',
'FIND_TABLE' : "select table_name from information_schema.tables where table_name like '%!_log' escape '!';",
'GET_DATA' : 'select %(cols)s, %(tcols)s from %(tname)s t inner join log l on l.id = t.log_id where l.stamp <= (timestamp :tstamp) order by l.id;',
'PURGE_DATA' : 'delete from %(ptable)s t using log l where l.id = t.log_id and l.stamp <= (timestamp :tstamp);',
@@ -137,7 +137,7 @@ def tables():
def columns(tbl):
"""What are the columns of table <tbl>?"""
- stmt = rhnSQL.execute(_get_sql('FIND_COLS'), table=tbl)
+ stmt = rhnSQL.execute(_get_sql('FIND_COLS'), the_table=tbl)
col_names = stmt.fetchall() or []
rc = []
for name in col_names:
commit 0c9cef2175ec68af148fef2257b62489320c605e
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Fri Sep 27 09:26:35 2013 -0400
1012934 - Oracle prepared-stmt cannot have semicolons
diff --git a/utils/spacewalk-archive-audits b/utils/spacewalk-archive-audits
index 09bbb87..42dffdf 100755
--- a/utils/spacewalk-archive-audits
+++ b/utils/spacewalk-archive-audits
@@ -48,10 +48,10 @@ LOG_LOCATION = '/var/log/rhn/archive-audit-tables.log'
LOG_COLS = ['id', 'stamp', 'user_id']
SQL_PIECES = {'oracle': {
- 'COUNT' : 'select count(*) from %(table)s;',
- 'FIND_COLS' : "select column_name from user_tab_columns where table_name = :table;",
- 'FIND_TABLE' : "select table_name from user_tables where table_name like '%!_LOG' escape '!';",
- 'GET_DATA' : "select %(cols)s, %(tcols)s from %(tname)s t inner join log l on l.id = t.log_id where l.stamp <= to_date(:tstamp, 'YYYY-MM-DD hh24:mi:ss') order by l.id;",
+ 'COUNT' : 'select count(*) from %(table)s',
+ 'FIND_COLS' : "select column_name from user_tab_columns where table_name = :table",
+ 'FIND_TABLE' : "select table_name from user_tables where table_name like '%|_LOG' escape '|'",
+ 'GET_DATA' : "select %(cols)s, %(tcols)s from %(tname)s t inner join log l on l.id = t.log_id where l.stamp <= to_date(:tstamp, 'YYYY-MM-DD hh24:mi:ss') order by l.id",
'PURGE_DATA' : """
delete %(ptable)s
where exists (
@@ -59,9 +59,9 @@ SQL_PIECES = {'oracle': {
from log l
where l.id = %(ptable)s.log_id
and l.stamp <= to_date(:tstamp, 'YYYY-MM-DD hh24:mi:ss')
- );
+ )
""",
- 'PURGE_LOG_DATA' : "delete from log l where l.stamp <= to_date(:tstamp, 'YYYY-MM-DD hh24:mi:ss');"
+ 'PURGE_LOG_DATA' : "delete from log l where l.stamp <= to_date(:tstamp, 'YYYY-MM-DD hh24:mi:ss')"
},
'postgresql' : {
'COUNT' : 'select count(*) from %(table)s;',
10 years, 7 months
proxy/installer
by Milan Zazrivec
proxy/installer/configure-proxy.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 54d1525cdbd10d283144dfe17fea03a3a23c22da
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Sep 27 11:50:06 2013 +0200
add missing $
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index 92137c0..83b0693 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -255,7 +255,7 @@ JABBERD_DIR=/etc/jabberd
SQUID_DIR=/etc/squid
SYSTEMID_PATH=`PYTHONPATH='/usr/share/rhn' python -c "from up2date_client import config; cfg = config.initUp2dateConfig(); print cfg['systemIdPath'] "`
-if [ ! -r SYSTEMID_PATH ]; then
+if [ ! -r $SYSTEMID_PATH ]; then
echo ERROR: Spacewalk Proxy does not appear to be registered
exit 2
fi
10 years, 7 months
java/code
by Silvio Moioli
java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4814aea658a36340747be51aceb591f51943e0fe
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Sep 27 11:45:26 2013 +0200
UserManagerTest: fix new timezone ordering
diff --git a/java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java b/java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java
index 6b35881..e009197 100644
--- a/java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java
@@ -395,8 +395,8 @@ public class UserManagerTest extends RhnBaseTestCase {
assertTrue(lst.get(34) instanceof RhnTimeZone);
assertTrue(((RhnTimeZone)lst.get(5)).equals(UserManager
- .getTimeZone("America/Phoenix")));
- assertTrue(((RhnTimeZone)lst.get(5)).getOlsonName().equals("America/Phoenix"));
+ .getTimeZone("America/Denver")));
+ assertTrue(((RhnTimeZone)lst.get(5)).getOlsonName().equals("America/Denver"));
}
public void testUsersInSet() throws Exception {
10 years, 7 months
java/code
by Silvio Moioli
java/code/src/com/redhat/rhn/domain/server/PushDispatcher.hbm.xml | 23 -
java/code/src/com/redhat/rhn/domain/server/PushDispatcher.java | 148 ----------
java/code/src/com/redhat/rhn/domain/server/test/PushDispatcherTest.java | 88 -----
3 files changed, 259 deletions(-)
New commits:
commit 4a773ff5a7174936fe1073333ed3de18bd169fd7
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Sep 27 11:30:30 2013 +0200
Orphaned class PushDispatcher removed
diff --git a/java/code/src/com/redhat/rhn/domain/server/PushDispatcher.hbm.xml b/java/code/src/com/redhat/rhn/domain/server/PushDispatcher.hbm.xml
deleted file mode 100644
index 5e45804..0000000
--- a/java/code/src/com/redhat/rhn/domain/server/PushDispatcher.hbm.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE hibernate-mapping
- PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "classpath://org/hibernate/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping>
- <class name="com.redhat.rhn.domain.server.PushDispatcher"
- table="rhnpushdispatcher" >
- <id name="id" type="long" column="ID">
- <meta attribute="scope-set">protected</meta>
- <generator class="sequence">
- <param name="sequence">rhn_pclient_id_seq</param>
- </generator>
- </id>
- <property name="jabberId" column="JABBER_ID" type="string" length="512"/>
- <property name="hostname" column="HOSTNAME" type="string" length="1024"/>
- <property name="port" column="PORT" type="integer"/>
- <property name="lastCheckin" column="LAST_CHECKIN" type="timestamp"/>
- <property name="created" column="CREATED" type="timestamp"
- insert="false" update="false"/>
- <property name="modified" column="MODIFIED" type="timestamp"
- insert="false" update="false"/>
- </class>
-</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/server/PushDispatcher.java b/java/code/src/com/redhat/rhn/domain/server/PushDispatcher.java
deleted file mode 100644
index 986a4bb..0000000
--- a/java/code/src/com/redhat/rhn/domain/server/PushDispatcher.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) 2009--2010 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public License,
- * version 2 (GPLv2). There is NO WARRANTY for this software, express or
- * implied, including the implied warranties of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
- * along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * Red Hat trademarks are not licensed under GPLv2. No permission is
- * granted to use or replicate Red Hat trademarks that are incorporated
- * in this software or its documentation.
- */
-package com.redhat.rhn.domain.server;
-
-import java.util.Date;
-
-/**
- * PushDispatcher - Class representation of the rhnPushDispatcher table.
- * Contains data used to connect to the osa-dispatcher and trigger a push
- * to clients.
- *
- * @version $Rev$
- */
-public class PushDispatcher {
-
- private Long id;
- private String jabberId;
- private String hostname;
- private Integer port;
- private Date lastCheckin;
- private Date created;
- private Date modified;
-
- /**
- * Getter for created
- * @return Date to get
- */
- public Date getCreated() {
- return created;
- }
-
- /**
- * Setter for created
- * @param createdIn to set
- */
- public void setCreated(Date createdIn) {
- this.created = createdIn;
- }
-
- /**
- * Getter for hostname
- * @return String to get
- */
- public String getHostname() {
- return hostname;
- }
-
- /**
- * Setter for hostname
- * @param hostnameIn to set
- */
- public void setHostname(String hostnameIn) {
- this.hostname = hostnameIn;
- }
-
- /**
- * Getter for id
- * @return Long to get
- */
- public Long getId() {
- return id;
- }
-
- /**
- * Setter for id
- * @param idIn to set
- */
- public void setId(Long idIn) {
- this.id = idIn;
- }
-
- /**
- * Getter for jabberId
- * @return String to get
- */
- public String getJabberId() {
- return jabberId;
- }
-
- /**
- * Setter for jabberId
- * @param jabberIdIn to set
- */
- public void setJabberId(String jabberIdIn) {
- this.jabberId = jabberIdIn;
- }
-
- /**
- * Getter for lastCheckin
- * @return Date to get
- */
- public Date getLastCheckin() {
- return lastCheckin;
- }
-
- /**
- * Setter for lastCheckin
- * @param lastCheckinIn to set
- */
- public void setLastCheckin(Date lastCheckinIn) {
- this.lastCheckin = lastCheckinIn;
- }
-
- /**
- * Getter for modified
- * @return Date to get
- */
- public Date getModified() {
- return modified;
- }
-
- /**
- * Setter for modified
- * @param modifiedIn to set
- */
- public void setModified(Date modifiedIn) {
- this.modified = modifiedIn;
- }
-
- /**
- * Getter for port
- * @return Integer to get
- */
- public Integer getPort() {
- return port;
- }
-
- /**
- * Setter for port
- * @param portIn to set
- */
- public void setPort(Integer portIn) {
- this.port = portIn;
- }
-
-}
diff --git a/java/code/src/com/redhat/rhn/domain/server/test/PushDispatcherTest.java b/java/code/src/com/redhat/rhn/domain/server/test/PushDispatcherTest.java
deleted file mode 100644
index 87f860e..0000000
--- a/java/code/src/com/redhat/rhn/domain/server/test/PushDispatcherTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright (c) 2009--2012 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public License,
- * version 2 (GPLv2). There is NO WARRANTY for this software, express or
- * implied, including the implied warranties of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
- * along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * Red Hat trademarks are not licensed under GPLv2. No permission is
- * granted to use or replicate Red Hat trademarks that are incorporated
- * in this software or its documentation.
- */
-package com.redhat.rhn.domain.server.test;
-
-import com.redhat.rhn.common.hibernate.HibernateFactory;
-import com.redhat.rhn.domain.server.PushDispatcher;
-import com.redhat.rhn.testing.RhnBaseTestCase;
-import com.redhat.rhn.testing.TestUtils;
-
-import org.hibernate.HibernateException;
-
-import java.util.Date;
-
-public class PushDispatcherTest extends RhnBaseTestCase {
-
- private static final String JABBER_ID = "Test Jabber ID";
- private static final String JABBER_ID_NEW = "Another Test Jabber ID";
- private static final Date LAST_CHECKIN = new Date();
- private static final String HOSTNAME = "test.hostname.com";
- private static final Integer PORT = new Integer(1290);
-
- private PushDispatcher original;
-
- public void setUp() throws Exception {
- super.setUp();
-
- original = createPushDispatcher();
- }
-
- public void testCreatePushDispatcher() throws Exception {
- PushDispatcher lookupDispatcher = (PushDispatcher) TestUtils
- .lookupTestObject("from PushDispatcher where id = " +
- original.getId().toString());
-
- assertEquals(JABBER_ID, lookupDispatcher.getJabberId());
- assertEquals(LAST_CHECKIN, lookupDispatcher.getLastCheckin());
- assertEquals(HOSTNAME, lookupDispatcher.getHostname());
- assertEquals(PORT, lookupDispatcher.getPort());
- }
-
- public void testUpdatePushDispatcher() throws Exception {
- PushDispatcher lookupDispatcher = (PushDispatcher) TestUtils
- .lookupTestObject("from PushDispatcher where id = " +
- original.getId().toString());
- lookupDispatcher.setJabberId(JABBER_ID_NEW);
- TestUtils.saveAndFlush(original);
-
- lookupDispatcher = (PushDispatcher) TestUtils
- .lookupTestObject("from PushDispatcher where id = " +
- original.getId().toString());
- assertEquals(JABBER_ID_NEW, lookupDispatcher.getJabberId());
- }
-
- public void testDeletePushDispatcher() throws Exception {
- TestUtils.removeObject(original);
- assertNull(TestUtils.lookupTestObject("from PushDispatcher where id = " +
- original.getId().toString()));
- }
-
- private PushDispatcher createPushDispatcher() {
- try {
- PushDispatcher dispatcher = new PushDispatcher();
- dispatcher.setJabberId(JABBER_ID);
- dispatcher.setLastCheckin(LAST_CHECKIN);
- dispatcher.setHostname(HOSTNAME);
- dispatcher.setPort(PORT);
-
- TestUtils.saveAndFlush(dispatcher);
- return dispatcher;
- }
- catch (HibernateException e) {
- HibernateFactory.rollbackTransaction();
- }
- return null;
- }
-}
10 years, 7 months
proxy/installer
by Milan Zazrivec
proxy/installer/configure-proxy.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit a370aee1c8b78a47e46ab4abc8b382a268fe808a
Author: Paresh Mutha <pmutha(a)pmutha.pnq.redhat.com>
Date: Tue Sep 24 15:44:36 2013 +0530
refer systemIdPath from up2date config
Signed-off-by: Paresh Mutha <pmutha(a)pmutha.pnq.redhat.com>
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index 3fb2a74..92137c0 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -253,13 +253,14 @@ HTTPDCONFD_DIR=/etc/httpd/conf.d
HTMLPUB_DIR=/var/www/html/pub
JABBERD_DIR=/etc/jabberd
SQUID_DIR=/etc/squid
+SYSTEMID_PATH=`PYTHONPATH='/usr/share/rhn' python -c "from up2date_client import config; cfg = config.initUp2dateConfig(); print cfg['systemIdPath'] "`
-if [ ! -r $SYSCONFIG_DIR/systemid ]; then
+if [ ! -r SYSTEMID_PATH ]; then
echo ERROR: Spacewalk Proxy does not appear to be registered
exit 2
fi
-SYSTEM_ID=$(/usr/bin/xsltproc /usr/share/rhn/get_system_id.xslt $SYSCONFIG_DIR/systemid | cut -d- -f2)
+SYSTEM_ID=$(/usr/bin/xsltproc /usr/share/rhn/get_system_id.xslt $SYSTEMID_PATH | cut -d- -f2)
DIR=/usr/share/doc/proxy/conf-template
HOSTNAME=$(hostname)
@@ -468,8 +469,8 @@ if [ $MONITORING -eq 0 ]; then
fi
# systemid need to be readable by apache/proxy
-chown root:apache $SYSCONFIG_DIR/systemid
-chmod 0640 $SYSCONFIG_DIR/systemid
+chown root:apache $SYSTEMID_PATH
+chmod 0640 $SYSTEMID_PATH
#Setup the cobbler stuff, needed to use koan through a proxy
PROTO="http";
10 years, 7 months
java/code
by Silvio Moioli
java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 7deeb461ab632967cd41694f659603c575116bdc
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Sep 27 10:54:22 2013 +0200
DataSourceParserTest: fix Oracle case-depentent tests
Username queries on the all_catalog table on Oracle can return results in the
wrong case (in particular: uppercase). Test code assumes that usernames are
lowercase in config files (see DataSourceParser.java:96), so those tests will
fail if case does not match, and this was actually verified with a 11g XE
instance.
This patch adds LOWERCASE() calls to restore correct results.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
index 6b0e3e4..00c0a27 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
@@ -3,7 +3,7 @@
<query params="username">
SELECT u.username as USERNAME, u.user_id as USER_ID, u.created as CREATED
FROM all_users u
- WHERE u.username=:username
+ WHERE LOWER(u.username) = :username
</query>
<elaborator name="table_elaborator_or" column="username" params="user_name">
SELECT c.owner as USERNAME, COUNT(c.table_name) as TABLE_COUNT
@@ -36,7 +36,7 @@
<elaborator name="table_elaborator_or" column="username" params="user_name">
SELECT c.owner as USERNAME, COUNT(c.table_name) as TABLE_COUNT
FROM all_catalog c
- WHERE owner=:user_name
+ WHERE LOWER(owner) = :user_name
AND owner IN (%s)
AND table_type='TABLE'
GROUP BY owner
@@ -322,12 +322,12 @@ SELECT u.created as CREATED
<query params="username">
SELECT u.username as USERNAME, u.user_id as USER_ID, u.created as CREATED
FROM all_users u
- WHERE u.username=:username
+ WHERE LOWER(u.username) = :username
</query>
<elaborator name="table_elaborator_or" column="username" params="username">
SELECT c.owner as USERNAME, COUNT(c.table_name) as TABLE_COUNT
FROM all_catalog c
- WHERE owner=:username
+ WHERE LOWER(owner) = :username
AND table_type='TABLE'
GROUP BY owner
</elaborator>
@@ -358,7 +358,7 @@ SELECT u.created as CREATED
<query name="external_elaborator_or" column="username" params="user_name">
SELECT c.owner as USERNAME, COUNT(c.table_name) as TABLE_COUNT
FROM all_catalog c
- WHERE owner=:user_name
+ WHERE LOWER(owner) = :user_name
AND table_type='TABLE'
GROUP BY owner
</query>
10 years, 7 months
java/code
by Silvio Moioli
java/code/src/com/redhat/rhn/domain/user/UserFactory.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit e753297050a29419e4be024e3354e01f72116cce
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Sep 27 09:01:39 2013 +0200
UserFactory: fix time zone ordering
UserFactoryTest.testTimeZoneLookupAll() can fail depending on timezone
ordering as returned by the database, which is not defined. In fact,
UserFactory's custom comparator returns zero when comparing
"America/New_York" to "America/Indianapolis", because they have the
same raw offset.
This patch compares Olson names when raw offsets are equal, restoring
test determinism.
diff --git a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
index 6daaa6f..023b002 100644
--- a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
@@ -538,8 +538,14 @@ public class UserFactory extends HibernateFactory {
if (timeZones != null) {
Collections.sort(timeZones, new Comparator() {
public int compare(Object o1, Object o2) {
- int offSet1 = ((RhnTimeZone)o1).getTimeZone().getRawOffset();
- int offSet2 = ((RhnTimeZone)o2).getTimeZone().getRawOffset();
+ RhnTimeZone t1 = (RhnTimeZone) o1;
+ RhnTimeZone t2 = (RhnTimeZone) o2;
+ int offSet1 = t1.getTimeZone().getRawOffset();
+ int offSet2 = t2.getTimeZone().getRawOffset();
+
+ if (offSet2 - offSet1 == 0) {
+ return t2.getOlsonName().compareTo(t1.getOlsonName());
+ }
if (offSet1 <= -18000000 && offSet1 >= -36000000 &&
offSet2 <= -18000000 && offSet2 >= -36000000) {
10 years, 7 months
java/code
by StephenHerr
java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e3162af485c911dc02c6a14f9a6db9ef723110a3
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Sep 26 16:43:14 2013 -0400
1012660 - somehow I missed one
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
index d89501e..791c723 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
@@ -10,7 +10,7 @@
</head>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt"
- helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp">
+ helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp#sect-Getting_Started_Guide-Errata_Management-Creating_and_Editing_Errata">
<bean:message key="errata.edit.toolbar"/> <c:out value="${advisory}" />
</rhn:toolbar>
10 years, 7 months
Changes to 'refs/tags/spacewalk-java-2.1.48-1'
by StephenHerr
Tag 'spacewalk-java-2.1.48-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-09-26 20:13 +0000
Tagging package [spacewalk-java] version [2.1.48-1] in directory [java/].
Changes since spacecmd-2.1.8-1:
David Juran (1):
Fix typo, the decoded output need to be printed...
Milan Zazrivec (1):
994531 - uptime report: respect xmlrpc's integer limits
Silvio Moioli (1):
Add exception stack trace logging in Taskomatic
Stephen Herr (2):
1012660 - move links for Channel Management Guide to correct places
Automatic commit of package [spacewalk-java] release [2.1.48-1].
Tomas Kasparek (1):
select from rhnServerNeededCache instead of rhnServerNeededPackageCache
---
client/rhel/rhn-client-tools/src/bin/rhn_check.py | 4 +++
java/code/src/com/redhat/rhn/taskomatic/task/RhnJavaJob.java | 11 ++++++++--
java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/addchannels.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/create.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/delete.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/edit.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/editchannels.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/notify.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/packagepush.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/packages/add.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/packages/list.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/published.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/unpublished.jsp | 2 -
java/spacewalk-java.spec | 6 ++++-
rel-eng/packages/spacewalk-java | 2 -
reporting/reports/data/packages-updates-all | 2 -
spacecmd/src/lib/schedule.py | 2 -
25 files changed, 40 insertions(+), 25 deletions(-)
---
10 years, 7 months