web/html
by StephenHerr
web/html/network/systems/system_list | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit df622ac01f986a611d6ce26d00796d2eec7bc415
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Apr 13 10:35:55 2012 -0400
Broken link patch submitted on behalf of Michael Calmer
diff --git a/web/html/network/systems/system_list b/web/html/network/systems/system_list
index 2e36da1..368cb9f 100644
--- a/web/html/network/systems/system_list
+++ b/web/html/network/systems/system_list
@@ -30,10 +30,10 @@
</rhn-require>
<column name="Errata" label="total_errata" align="center" width="5%">
- <url>/network/systems/details/errata_list.pxt?sid={column:id}</url>
+ <url>/rhn/systems/details/ErrataList.do?sid={column:id}</url>
</column>
<column name="Packages" label="outdated_packages" align="center" width="5%">
- <url>/network/systems/details/packages/upgrade.pxt?sid={column:id}</url>
+ <url>/rhn/systems/details/packages/UpgradableList.do?sid={column:id}</url>
</column>
<column name="System" label="server_name" sort_by="1" align="left" width="35%">
<url>/rhn/systems/details/Overview.do?sid={column:id}</url>
12 years, 2 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c99e53de2509e76e2ec04c484ae318c4a8f81480
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 13 16:27:04 2012 +0200
812053 - change the condition
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index 91afcb1..d2b6bc9 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -892,7 +892,7 @@ public class ErrataHandler extends BaseHandler {
}
//if calling cloneAsOriginal, do additional checks to verify a clone
- if (inheritAllPackages) {
+ if (!inheritAllPackages) {
if (!channel.isCloned()) {
throw new InvalidChannelException("Cloned channel expected: " +
channel.getLabel());
12 years, 2 months
2 commits - backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/rhn-charsets | 108 +++--------------------------------
1 file changed, 12 insertions(+), 96 deletions(-)
New commits:
commit 92e8e16447fdf58e4289b7769597c740680c5d9c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 13 16:19:29 2012 +0200
812329 - make rhn-charsets working on PostgreSQL as well; the output format changed even for Oracle.
diff --git a/backend/satellite_tools/rhn-charsets b/backend/satellite_tools/rhn-charsets
index 5ac13a4..d92e297 100755
--- a/backend/satellite_tools/rhn-charsets
+++ b/backend/satellite_tools/rhn-charsets
@@ -1,98 +1,13 @@
-#!/usr/bin/python -u
-#
-# Copyright (c) 2008--2011 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.
-#
-
-import sys
-try:
- import os
- from os.path import exists, join
-except KeyboardInterrupt:
- sys.stderr.write("\nUser interrupted process.\n")
- sys.exit(0)
-
-
-def errAndExit(errno, msg):
- sys.stderr.write(msg+'\n')
- sys.exit(errno)
-
-
-# figure out import path
-_LIBPATH = ""
-for p in ["/var/www/rhns", "/usr/share/rhn"]:
- if exists(p) and exists(join(p, 'server')) and exists(join(p, 'common')):
- _LIBPATH = p
-if _LIBPATH not in sys.path:
- sys.path.append(_LIBPATH)
-
-
-try:
- from spacewalk.server import rhnSQL
- from spacewalk.common.rhnConfig import initCFG
-except KeyboardInterrupt:
- sys.stderr.write("\nUser interrupted process.\n")
- sys.exit(0)
-
-
-def processCommandline():
- """ process the commandline """
-
- from optparse import Option, OptionParser
- optionsTable = [
- Option('--db', action='store', type="string",
- help='alternative database string (USERNAME/PASSWORD@SID). '+\
- 'Default value is the DEFAULT_DB setting in '+\
- '/etc/rhn/rhn.conf'),
- ]
-
- optionParser = OptionParser(option_list=optionsTable)
- options, args = optionParser.parse_args()
-
- # we take no extra commandline arguments that are not linked to an option
- if args:
- msg = "ERROR: these arguments make no sense in this context (try "+\
- "--help): %s\n" % repr(args)
- sys.stderr.write(msg)
- sys.exit(-1)
-
- initCFG('server')
- rhnSQL.initDB(options.db)
-
- return options
-
-
-if __name__ == '__main__':
- options = processCommandline()
-
- try:
- h = rhnSQL.prepare("""
- SELECT parameter, value
- FROM nls_database_parameters
- WHERE parameter = 'NLS_CHARACTERSET'
- OR parameter = 'NLS_NCHAR_CHARACTERSET'
- """)
- h.execute()
- while True:
- row = h.fetchone_dict()
- if not row:
- break
- print '%s: %s' % (row['parameter'], repr(row['value']))
- except KeyboardInterrupt:
- sys.stderr.write("\nUser interrupted process.\n")
- sys.exit(0)
- except (rhnSQL.SQLError, rhnSQL.SQLSchemaError, rhnSQL.SQLConnectError), e:
- # really a stub for better exception handling in the future.
- sys.stderr.write("SQL error occurred, traceback follows...\n")
- raise
+#!/bin/bash
+
+BACKEND=$( spacewalk-cfg-get db_backend )
+
+if [ $BACKEND == 'oracle' ]; then
+ echo "SELECT parameter, value from nls_database_parameters where parameter in ( 'NLS_CHARACTERSET', 'NLS_NCHAR_CHARACTERSET' );" | spacewalk-sql --select-mode -
+elif [ $BACKEND == 'postgresql' ]; then
+ echo 'show server_encoding; show client_encoding;' | spacewalk-sql --select-mode -
+else
+ echo "Unknown database backend [$BACKEND]"
+ exit 1
+fi
commit 59cbf20acde9699a7a6c2e9c2c24ace5484d7f91
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 13 16:04:44 2012 +0200
812329 - the key variables are not used at all -- just print out everything we got.
diff --git a/backend/satellite_tools/rhn-charsets b/backend/satellite_tools/rhn-charsets
index 065d147..5ac13a4 100755
--- a/backend/satellite_tools/rhn-charsets
+++ b/backend/satellite_tools/rhn-charsets
@@ -83,10 +83,11 @@ if __name__ == '__main__':
OR parameter = 'NLS_NCHAR_CHARACTERSET'
""")
h.execute()
- for key in ('NLS_CHARACTERSET', 'NLS_NCHAR_CHARACTERSET'):
+ while True:
row = h.fetchone_dict()
- if row:
- print '%s: %s' % (row['parameter'], repr(row['value']))
+ if not row:
+ break
+ print '%s: %s' % (row['parameter'], repr(row['value']))
except KeyboardInterrupt:
sys.stderr.write("\nUser interrupted process.\n")
sys.exit(0)
12 years, 2 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit f4dd7ee357ce2d02e118e3f996439a906fb181b1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 13 15:51:33 2012 +0200
print extra stack trace
sometimes there're exceptions within exceptions we do not see, so adding extra trace
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java
index 2b4f248..2c61e19 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java
@@ -185,6 +185,7 @@ public class XmlRpcServlet extends HttpServlet {
// By the time we get here, it can't be a FaultException, so just
// wrap it in a ServletException and toss.
ServletException e = new ServletException("Throwable from XmlRpc", t);
+ t.printStackTrace();
e.initCause(t);
throw e;
}
12 years, 2 months
2 commits - backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/spacewalk-debug | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 32041195b357640ca763cdc6fb49ad94bd1d5032
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 13 15:44:36 2012 +0200
812329 - add sudoers.d to the debug, there can be important information there.
diff --git a/backend/satellite_tools/spacewalk-debug b/backend/satellite_tools/spacewalk-debug
index 786bb6d..506fba0 100755
--- a/backend/satellite_tools/spacewalk-debug
+++ b/backend/satellite_tools/spacewalk-debug
@@ -175,9 +175,9 @@ if [ -d /root/ssl-build ] ; then
fi
# /etc/sudoers
-if [ -f /etc/sudoers ] ; then
- echo " * copying /etc/sudoers"
- cp -fa /etc/sudoers $DIR/conf
+if [ -f /etc/sudoers -o -d /etc/sudoers.d ] ; then
+ echo " * copying /etc/sudoers*"
+ cp -faRd /etc/sudoers* $DIR/conf
fi
# /etc/passwd
commit 034b2b11438c39d70effbf54a9a6ccb0894123c6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 13 15:38:11 2012 +0200
812329 - The /etc/tnsnames.ora file might not exists.
Addressing
# spacewalk-debug
Collecting and packaging relevant diagnostic information.
Warning: this may take some time...
* copying configuration information
cp: cannot stat `/etc/tnsnames.ora': No such file or directory
diff --git a/backend/satellite_tools/spacewalk-debug b/backend/satellite_tools/spacewalk-debug
index 07d210a..786bb6d 100755
--- a/backend/satellite_tools/spacewalk-debug
+++ b/backend/satellite_tools/spacewalk-debug
@@ -97,7 +97,9 @@ echo " * copying configuration information"
cp -fapRd /etc/httpd/conf* $DIR/conf/httpd
cp -fapRd /etc/rhn $DIR/conf/rhn
cp -fapRd /etc/sysconfig/rhn $DIR/conf/rhn/sysconfig
-cp -fapRd /etc/tnsnames.ora $DIR/conf
+if [ -f /etc/tnsnames.ora ] ; then
+ cp -fad /etc/tnsnames.ora $DIR/conf
+fi
echo " * copying logs"
cp -fapRd /var/log/httpd $DIR/httpd-logs
12 years, 2 months
java/code
by Tomas Lestach
java/code/webapp/WEB-INF/struts-config.xml | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit bcc055b02eb13c7ac5d38cdb7a2b5f1be52df8db
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 13 12:14:27 2012 +0200
804665 - do not scrub search_string
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 2c79bb3..591c766 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -313,6 +313,8 @@
<form-property name="invert" type="java.lang.Boolean" />
<form-property name="fineGrained" type="java.lang.Boolean" />
<form-property name="submitted" type="java.lang.Boolean" />
+ <form-property name="no_scrub" type="java.lang.String"
+ initial="search_string"/>
</form-bean>
<form-bean name="docsSearchForm"
12 years, 2 months
proxy/proxy
by Shannon Hughes
proxy/proxy/rhnProxyAuth.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 57598ac46fbf15c744d5de4849b8e42569bf4f40
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Fri Apr 13 08:48:06 2012 -0400
811990 - refresh proxy auth cache for hostname changes
Worked with msuchy to get this patch into spacewalk. Patch changes the cache key to include
hostname so when the incoming apache request has a different hostname in the url, the cache will
now consider the hostname and update cache when hostnames differ.
Tested using a dual chained proxy attached to a Satellite:
Client -> Proxy A -> Proxy B -> Satellite
Ran elinks testing kickstart file generations with proxy A ip hostname and proxy A canonical hostname
Ran kickstart installs
Ran yum updates on packages
diff --git a/proxy/proxy/rhnProxyAuth.py b/proxy/proxy/rhnProxyAuth.py
index 85ba60e..b26370b 100644
--- a/proxy/proxy/rhnProxyAuth.py
+++ b/proxy/proxy/rhnProxyAuth.py
@@ -22,6 +22,7 @@ import time
import socket
import xmlrpclib
import sys
+from hashlib import sha1
## local imports
import rhnAuthCacheClient
@@ -364,7 +365,7 @@ problems, isn't running, or the token is somehow corrupt.
return serverObj
def __cache_proxy_key(self):
- return 'p' + str(self.__serverid)
+ return 'p' + str(self.__serverid) + sha1(self.hostname).hexdigest()
def getProxyServerId(self):
return self.__serverid
12 years, 2 months
Changes to 'refs/tags/spacewalk-java-1.8.44-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.44-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-13 12:21 +0000
Tagging package [spacewalk-java] version [1.8.44-1] in directory [java/].
Changes since spacewalk-utils-1.8.5-1:
Jan Pazdziora (2):
Fixing checkstyle.
Automatic commit of package [spacewalk-java] release [1.8.44-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 5 ++---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
---
12 years, 2 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e08c0a11e5d7dcfb5f5c8bd6541383b38fd23e9c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 13 14:21:50 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.44-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index faba64d..958927a 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.43
+Version: 1.8.44
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Apr 13 2012 Jan Pazdziora 1.8.44-1
+- Fixing checkstyle.
+
* Fri Apr 13 2012 Jan Pazdziora 1.8.43-1
- fix KickstartWizardCommandTest (tlestach(a)redhat.com)
- 812053 - making errata.clone api not requires cloned channels
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 13c1546..97ecb6d 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.43-1 java/
+1.8.44-1 java/
12 years, 2 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit ab89258e53a12bf0f455cf870c34af77866a6b45
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 13 14:21:17 2012 +0200
Fixing checkstyle.
Addressing
Starting audit...
./code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java:895:11: 'if' is not followed by whitespace.
./code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java:895:31: '{' is not preceded with whitespace.
./code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java:902: Line has trailing spaces.
./code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java:912: Line has trailing spaces.
Audit done.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index 723fd0a..91afcb1 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -892,14 +892,14 @@ public class ErrataHandler extends BaseHandler {
}
//if calling cloneAsOriginal, do additional checks to verify a clone
- if(inheritAllPackages){
+ if (inheritAllPackages) {
if (!channel.isCloned()) {
throw new InvalidChannelException("Cloned channel expected: " +
channel.getLabel());
}
Channel original = ChannelFactory.lookupOriginalChannel(channel);
-
+
if (original == null) {
throw new InvalidChannelException("Cannot access original " +
"of the channel: " + channel.getLabel());
@@ -909,7 +909,6 @@ public class ErrataHandler extends BaseHandler {
throw new LookupException("User " + loggedInUser.getLogin() +
" does not have access to channel " + original.getLabel());
}
-
}
12 years, 2 months