2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr
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 +-
21 files changed, 25 insertions(+), 21 deletions(-)
New commits:
commit 8f9b50b65e508adfce56eb1d65f4c9955dc64d6a
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Sep 26 16:13:30 2013 -0400
Automatic commit of package [spacewalk-java] release [2.1.48-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index da08379..e8d4e1b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.47
+Version: 2.1.48
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Sep 26 2013 Stephen Herr <sherr(a)redhat.com> 2.1.48-1
+- 1012660 - move links for Channel Management Guide to correct places
+- Add exception stack trace logging in Taskomatic
+
* Mon Sep 23 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.47-1
- fixing checkstyle
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 300da89..c90bb98 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.47-1 java/
+2.1.48-1 java/
commit 73648dd763c54a3bd514629411a0361264d62b4b
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Sep 26 16:11:47 2013 -0400
1012660 - move links for Channel Management Guide to correct places
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
index 1a2f3b9..2d7e7ff 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
@@ -14,7 +14,7 @@
cloneUrl="/network/software/channels/manage/clone.pxt?pxt:trap=rhn:empty_set&set_label=errata_clone_actions"
cloneType="channel"
cloneAcl="user_role(channel_admin)"
- helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Channel_and_Package_Management.jsp"
+ helpUrl="/rhn/help/getting-started/en-US/sect-Getting_Started_Guide-Channel_Management-Creating_and_Managing_Custom_Channels.jsp"
>
<bean:message key="channels.manage.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp
index 0b4755c..78a237f 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp
@@ -12,7 +12,7 @@
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-packages.gif" imgAlt="overview.jsp.alt"
- helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Channel_and_Package_Management-Manage_Software_Packages.jsp">
+ helpUrl="/rhn/help/getting-started/en-US/sect-Getting_Started_Guide-Channel_Management-Creating_and_Managing_Custom_Channels-Removing_Software_Packages.jsp">
<bean:message key="channel.jsp.manage.package.title"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
index 495c4c3..4dfd892 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
@@ -20,7 +20,7 @@
</head>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-packages.gif" imgAlt="overview.jsp.alt"
- helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Channel_and_Package_Management-Manage_Software_Packages.jsp">
+ helpUrl="/rhn/help/getting-started/en-US/sect-Getting_Started_Guide-Channel_Management-Creating_and_Managing_Custom_Channels-Removing_Software_Packages.jsp">
<bean:message key="channel.jsp.manage.package.title"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp b/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp
index 6e28822..9ead385 100644
--- a/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp
@@ -10,7 +10,7 @@
</head>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
- helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management.jsp">
+ helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp">
<bean:message key="errata.publish.toolbar"/> <c:out value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp b/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp
index 2eae333..9a04f7d 100644
--- a/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp
@@ -10,7 +10,7 @@
</head>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
- helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management.jsp">
+ helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp">
<bean:message key="errata.publish.toolbar"/> <c:out value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
index 6b92dae..80bd1b3 100644
--- a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
@@ -10,7 +10,7 @@
</head>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
- helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management.jsp">
+ helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp">
<bean:message key="errata.publish.toolbar"/> <c:out value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
index eb63a4c..19d559d 100644
--- a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
@@ -7,7 +7,7 @@
<html:html xhtml="true">
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
- helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Cloning_Errata.jsp">
+ helpUrl="/rhn/help/getting-started/en-US/sect-Getting_Started_Guide-Errata_Management-Cloning_Errata.jsp">
<bean:message key="cloneerrata.jsp.erratamanagement"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/create.jsp b/java/code/webapp/WEB-INF/pages/errata/create.jsp
index 5071e86..963fd11 100644
--- a/java/code/webapp/WEB-INF/pages/errata/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/create.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-Creating_and_Editing_Errata.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="erratalist.jsp.erratamgmt"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/delete.jsp b/java/code/webapp/WEB-INF/pages/errata/delete.jsp
index c7b126a..a2ebcd6 100644
--- a/java/code/webapp/WEB-INF/pages/errata/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/delete.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-Creating_and_Editing_Errata.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="${errata.advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/edit.jsp b/java/code/webapp/WEB-INF/pages/errata/edit.jsp
index d0d0c2d..a0efebb 100644
--- a/java/code/webapp/WEB-INF/pages/errata/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/edit.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"
deletionUrl="/rhn/errata/manage/Delete.do?eid=${param.eid}"
deletionType="errata">
<bean:message key="errata.edit.toolbar"/> <c:out value="${advisory}" />
diff --git a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
index bd0db36..fc7698e 100644
--- a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/editchannels.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>
diff --git a/java/code/webapp/WEB-INF/pages/errata/notify.jsp b/java/code/webapp/WEB-INF/pages/errata/notify.jsp
index 9cedde0..e7fb142 100644
--- a/java/code/webapp/WEB-INF/pages/errata/notify.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/notify.jsp
@@ -10,7 +10,7 @@
</head>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
- 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"
deletionUrl="/rhn/errata/Delete.do?eid=${param.eid}"
deletionType="errata">
<bean:message key="errata.edit.toolbar"/> <c:out value="${advisory}" />
diff --git a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
index 978d13a..84f2b80 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
@@ -10,7 +10,7 @@
</head>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
- helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management.jsp">
+ helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp">
<bean:message key="errata.publish.toolbar"/> <c:out value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
index 11447dd..45b63cb 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
@@ -20,7 +20,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>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
index e91af3a..396e2d3 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
@@ -11,7 +11,7 @@
</head>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
- 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>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
index 7d835dc..327bf1d 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/list.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>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
index a35fbe0..6938c30 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
@@ -10,7 +10,7 @@
</head>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
- 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>
diff --git a/java/code/webapp/WEB-INF/pages/errata/published.jsp b/java/code/webapp/WEB-INF/pages/errata/published.jsp
index 6363e1a..1222db6 100644
--- a/java/code/webapp/WEB-INF/pages/errata/published.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/published.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.jsp#channel-mgmt-Manage_Errata-Published_Errata"
+ helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp"
creationUrl="/rhn/errata/manage/Create.do"
creationType="erratum">
<bean:message key="erratalist.jsp.erratamgmt"/>
diff --git a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
index 3b5a87d..f98ea2a 100644
--- a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/unpublished.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.jsp#channel-mgmt-Manage_Errata-Unpublished_Errata"
+ helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp"
creationUrl="/rhn/errata/manage/Create.do"
creationType="erratum">
<bean:message key="erratalist.jsp.erratamgmt"/>
10 years, 7 months
reporting/reports
by Tomáš Kašpárek
reporting/reports/data/packages-updates-all | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 23ffc4542907d4dd3a0932e6c800baf73031634f
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Sep 26 14:15:16 2013 +0200
select from rhnServerNeededCache instead of rhnServerNeededPackageCache
no need to select from rhnServerNeededPackageCache view - all info needed is in rhnServerNeededCache
diff --git a/reporting/reports/data/packages-updates-all b/reporting/reports/data/packages-updates-all
index b718f2c..f08d000 100644
--- a/reporting/reports/data/packages-updates-all
+++ b/reporting/reports/data/packages-updates-all
@@ -34,7 +34,7 @@ sql:
NPE.version as newer_version,
NPE.release as newer_release
from rhnServer S
- join rhnServerNeededPackageCache SPC on S.id=SPC.server_id
+ join rhnServerNeededCache SPC on S.id=SPC.server_id
join rhnPackage P on SPC.package_id=P.id
join rhnPackageName PN on P.name_id=PN.id
join rhnServerPackage SP on SP.server_id=S.id and SP.name_id=P.name_id
10 years, 7 months
spacecmd/src
by Tomáš Kašpárek
spacecmd/src/lib/schedule.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a16ac4e085dfb69f5236c4170219c9112f9cc05b
Author: David Juran <djuran(a)redhat.com>
Date: Thu Sep 26 10:19:43 2013 +0200
Fix typo, the decoded output need to be printed...
diff --git a/spacecmd/src/lib/schedule.py b/spacecmd/src/lib/schedule.py
index e05c528..c4fbcc3 100644
--- a/spacecmd/src/lib/schedule.py
+++ b/spacecmd/src/lib/schedule.py
@@ -318,7 +318,7 @@ def do_schedule_getoutput(self, args):
print 'Output'
print '------'
if r.get('output_enc64'):
- base64.b64decode(r.get('output'))
+ print base64.b64decode(r.get('output'))
else:
print r.get('output').encode('UTF8')
10 years, 7 months
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/src/bin/rhn_check.py | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit b258e06ea3329b6782fdd21db77939380b3a85ca
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Sep 25 17:45:53 2013 +0200
994531 - uptime report: respect xmlrpc's integer limits
On a machine with many cpus, the idle value we're trying to report
may overflow xmlrpc's integer limits. rhn_check would in these cases
fail with the following traceback:
Traceback (most recent call last):
File "/usr/sbin/rhn_check", line 378, in <module>
cli.run()
File "/usr/share/rhn/up2date_client/rhncli.py", line 84, in run
sys.exit(self.main() or 0)
File "/usr/sbin/rhn_check", line 75, in main
self.__run_remote_actions()
File "/usr/sbin/rhn_check", line 169, in __run_remote_actions
action = self.__get_action(status_report)
File "/usr/sbin/rhn_check", line 87, in __get_action
ACTION_VERSION, status_report)
File "/usr/lib64/python2.6/xmlrpclib.py", line 1199, in __call__
return self.__send(self.__name, args)
File "/usr/share/rhn/up2date_client/rpcServer.py", line 39, in _request1
ret = self._request(methodname, params)
File "/usr/lib/python2.6/site-packages/rhn/rpclib.py", line 379, in _request
request = self._req_body(self._strip_characters(params), methodname)
File "/usr/lib/python2.6/site-packages/rhn/rpclib.py", line 234, in _req_body
return xmlrpclib.dumps(params, methodname, encoding=self._encoding)
File "/usr/lib64/python2.6/xmlrpclib.py", line 1132, in dumps
data = m.dumps(params)
File "/usr/lib64/python2.6/xmlrpclib.py", line 677, in dumps
dump(v, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 699, in __dump
f(self, value, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 780, in dump_struct
dump(v, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 699, in __dump
f(self, value, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 759, in dump_array
dump(v, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 699, in __dump
f(self, value, write)
File "/usr/lib64/python2.6/xmlrpclib.py", line 710, in dump_int
raise OverflowError, "int exceeds XML-RPC limits"
<type 'exceptions.OverflowError'>: int exceeds XML-RPC limits
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn_check.py b/client/rhel/rhn-client-tools/src/bin/rhn_check.py
index 6376a01..cb9f366 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhn_check.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn_check.py
@@ -315,6 +315,10 @@ class CheckCli(rhncli.RhnCli):
except:
pass
+ # We need to fit into xmlrpc's integer limits
+ if status_report['uptime'][1] > 2L**31-1:
+ status_report['uptime'][1] = -1
+
return status_report
@staticmethod
10 years, 7 months
java/code
by Silvio Moioli
java/code/src/com/redhat/rhn/taskomatic/task/RhnJavaJob.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit d6a6ad7c0cda0c077e4c4d52f7332cbdfcb1fcd2
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Sep 24 14:55:24 2013 +0200
Add exception stack trace logging in Taskomatic
Some extra information was added to the Taskomatic error log if an unexpected
exception gets thrown in task code. Previously only cause and message were
printed, which could be insufficient information to do proper debugging
(notably, NullPointerExceptions by default have null message and cause,
making them hard to track down).
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RhnJavaJob.java b/java/code/src/com/redhat/rhn/taskomatic/task/RhnJavaJob.java
index 22073e3..61177fb 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/RhnJavaJob.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/RhnJavaJob.java
@@ -26,6 +26,8 @@ import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.Arrays;
@@ -65,8 +67,13 @@ public abstract class RhnJavaJob implements RhnJob {
* {@inheritDoc}
*/
public void appendExceptionToLogError(Exception e) {
- log.error(e.getMessage());
- log.error(e.getCause());
+ log.error("Executing a task threw an exception: " + e.getClass().getName());
+ log.error("Message: " + e.getMessage());
+ log.error("Cause: " + e.getCause());
+
+ StringWriter errors = new StringWriter();
+ e.printStackTrace(new PrintWriter(errors));
+ log.error("Stack trace:" + errors.toString());
}
/**
10 years, 7 months
Changes to 'refs/tags/spacecmd-2.1.8-1'
by aparsons
Tag 'spacecmd-2.1.8-1' created by Aron Parsons <aronparsons(a)gmail.com> at 2013-09-24 02:25 +0000
Tagging package [spacecmd] version [2.1.8-1] in directory [spacecmd/].
Changes since rhncfg-5.10.62-1:
Aron Parsons (3):
spacecmd: make globbing optional in parse_arguments()
spacecmd: add softwarechannel_setsyncschedule function
Automatic commit of package [spacecmd] release [2.1.8-1].
David Juran (2):
spacecmd: handle base64-encoded output in schedule_getoutput
spacecmd: use a non-privileged API call to check session validity
---
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 8 +++++++-
spacecmd/src/lib/misc.py | 2 +-
spacecmd/src/lib/schedule.py | 7 ++++++-
spacecmd/src/lib/softwarechannel.py | 23 +++++++++++++++++++++++
spacecmd/src/lib/utils.py | 5 +++--
6 files changed, 41 insertions(+), 6 deletions(-)
---
10 years, 7 months
5 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by aparsons
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 8 +++++++-
spacecmd/src/lib/misc.py | 2 +-
spacecmd/src/lib/schedule.py | 7 ++++++-
spacecmd/src/lib/softwarechannel.py | 23 +++++++++++++++++++++++
spacecmd/src/lib/utils.py | 5 +++--
6 files changed, 41 insertions(+), 6 deletions(-)
New commits:
commit 308d7120f452b69ed6789a8a44dda78d2ee2722a
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Mon Sep 23 22:25:49 2013 -0400
Automatic commit of package [spacecmd] release [2.1.8-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index 0bd3b88..c6ca8c2 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-2.1.7-1 spacecmd/
+2.1.8-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 47dab6b..c90b86e 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 2.1.7
+Version: 2.1.8
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -64,6 +64,12 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Mon Sep 23 2013 Aron Parsons <aronparsons(a)gmail.com> 2.1.8-1
+- spacecmd: use a non-privileged API call to check session validity
+- spacecmd: handle base64-encoded output in schedule_getoutput
+- spacecmd: add softwarechannel_setsyncschedule function
+- spacecmd: make globbing optional in parse_arguments()
+
* Mon Sep 02 2013 Aron Parsons <aronparsons(a)gmail.com> 2.1.7-1
- spacecmd: try to use a cached session even if the username is passed on the
command line
commit 6b2b4cc972420439cfd3e2f5ca9c79cc03436e5d
Author: David Juran <djuran(a)redhat.com>
Date: Mon Sep 23 22:25:01 2013 -0400
spacecmd: use a non-privileged API call to check session validity
Signed-off-by: Aron Parsons <aronparsons(a)gmail.com>
diff --git a/spacecmd/src/lib/misc.py b/spacecmd/src/lib/misc.py
index e84b88a..dff6fb3 100644
--- a/spacecmd/src/lib/misc.py
+++ b/spacecmd/src/lib/misc.py
@@ -307,7 +307,7 @@ def do_login(self, args):
try:
logging.debug('Using cached credentials from %s' % session_file)
- self.client.user.listUsers(self.session)
+ self.client.api.getApiNamespaces(self.session)
except:
logging.warning('Cached credentials are invalid')
self.current_user = ''
commit 1f0896775c6e9651a99e91b062c0629e84e84f48
Author: David Juran <djuran(a)redhat.com>
Date: Mon Sep 23 22:14:31 2013 -0400
spacecmd: handle base64-encoded output in schedule_getoutput
Signed-off-by: Aron Parsons <aronparsons(a)gmail.com>
diff --git a/spacecmd/src/lib/schedule.py b/spacecmd/src/lib/schedule.py
index f193dd8..e05c528 100644
--- a/spacecmd/src/lib/schedule.py
+++ b/spacecmd/src/lib/schedule.py
@@ -20,6 +20,7 @@
# NOTE: the 'self' variable is an instance of SpacewalkShell
+import base64
from operator import itemgetter
from spacecmd.utils import *
@@ -316,7 +317,11 @@ def do_schedule_getoutput(self, args):
print
print 'Output'
print '------'
- print r.get('output')
+ if r.get('output_enc64'):
+ base64.b64decode(r.get('output'))
+ else:
+ print r.get('output').encode('UTF8')
+
else:
completed = self.client.schedule.listCompletedSystems(self.session,
action_id)
commit c9861e1e914601f114f6f37897c677f920bde578
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Fri Sep 13 19:07:50 2013 -0400
spacecmd: add softwarechannel_setsyncschedule function
diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py
index e0b86d8..93f8867 100644
--- a/spacecmd/src/lib/softwarechannel.py
+++ b/spacecmd/src/lib/softwarechannel.py
@@ -1598,4 +1598,27 @@ def do_softwarechannel_syncrepos(self, args):
logging.debug('Syncing repos for %s' % channel)
self.client.channel.software.syncRepo(self.session, channel)
+####################
+
+def help_softwarechannel_setsyncschedule(self):
+ print 'softwarechannel_setsyncschedule: '
+ print 'Sets the repo sync schedule for a software channel'
+ print
+ print 'usage: softwarechannel_setsyncschedule <CHANNEL> <SCHEDULE>'
+
+def complete_softwarechannel_setsyncschedule(self, text, line, beg, end):
+ return tab_completer(self.do_softwarechannel_list('', True), text)
+
+def do_softwarechannel_setsyncschedule(self, args):
+ (args, options) = parse_arguments(args, glob = False)
+
+ if not len(args) == 7:
+ self.help_softwarechannel_setsyncschedule()
+ return
+
+ channel = args[0]
+ schedule = ' '.join(args[1:])
+
+ self.client.channel.software.syncRepo(self.session, channel, schedule)
+
# vim:ts=4:expandtab:
commit ab26993dcf94cdf6b50352de66398a6d34b12502
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Fri Sep 13 19:07:21 2013 -0400
spacecmd: make globbing optional in parse_arguments()
diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py
index a289cb2..8a45f69 100644
--- a/spacecmd/src/lib/utils.py
+++ b/spacecmd/src/lib/utils.py
@@ -38,12 +38,13 @@ except ImportError:
__EDITORS = ['vim', 'vi', 'nano', 'emacs']
-def parse_arguments(args, options = []):
+def parse_arguments(args, options = [], glob = True):
try:
parts = shlex.split(args)
# allow simple globbing
- parts = [re.sub('\*', '.*', a) for a in parts]
+ if glob:
+ parts = [re.sub('\*', '.*', a) for a in parts]
parser = SpacecmdOptionParser(option_list = options)
(opts, leftovers) = parser.parse_args(args = parts)
10 years, 7 months
Changes to 'refs/tags/rhncfg-5.10.62-1'
by Grant Gainey
Tag 'rhncfg-5.10.62-1' created by Grant Gainey <ggainey(a)redhat.com> at 2013-09-23 17:23 +0000
Tagging package [rhncfg] version [5.10.62-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-java-2.1.47-1:
Grant Gainey (2):
1006480 - Another problem was hidden by the previous one
Automatic commit of package [rhncfg] release [5.10.62-1].
Matej Kollar (3):
Small whitespace changes
1002041 - File content is loaded only when needed
Reading only one line
---
client/tools/rhncfg/actions/script.py | 39 ++++++++++-------
client/tools/rhncfg/config_client/rhncfg-client.conf | 2
client/tools/rhncfg/rhncfg.spec | 8 +++
client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py | 35 +++++++++------
rel-eng/packages/rhncfg | 2
5 files changed, 55 insertions(+), 31 deletions(-)
---
10 years, 7 months
client/tools rel-eng/packages
by Grant Gainey
client/tools/rhncfg/rhncfg.spec | 8 +++++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 75361fce0f14046d666bc04cc750520258c7dbb8
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Mon Sep 23 13:23:02 2013 -0400
Automatic commit of package [rhncfg] release [5.10.62-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 0807651..0823090 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.61
+Version: 5.10.62
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -120,6 +120,12 @@ fi
# $Id$
%changelog
+* Mon Sep 23 2013 Grant Gainey <ggainey(a)redhat.com> 5.10.62-1
+- 1006480 - Another problem was hidden by the previous one - Have to lay down
+ directories to where the rhncfg-actions logfile is set - Make it clearer
+ that the scripts-output should go to a different place than where the
+ rhncfg code logs itself to
+
* Tue Sep 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.10.61-1
- Grammar error occurred
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 784a8e6..1418efe 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.61-1 client/tools/rhncfg/
+5.10.62-1 client/tools/rhncfg/
10 years, 7 months
client/tools
by Grant Gainey
client/tools/rhncfg/actions/script.py | 39 ++++++++++++-------
client/tools/rhncfg/config_client/rhncfg-client.conf | 2
2 files changed, 26 insertions(+), 15 deletions(-)
New commits:
commit ef93d6ec962e998367ae52c20af421d5da5324b2
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Mon Sep 23 13:19:47 2013 -0400
1006480 - Another problem was hidden by the previous one
- Have to lay down directories to where the rhncfg-actions logfile is set
- Make it clearer that the scripts-output should go to a different place
than where the rhncfg code logs itself to
diff --git a/client/tools/rhncfg/actions/script.py b/client/tools/rhncfg/actions/script.py
index 6ec164f..a03bd3d 100644
--- a/client/tools/rhncfg/actions/script.py
+++ b/client/tools/rhncfg/actions/script.py
@@ -7,10 +7,10 @@
# 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.
+# in this software or its documentation.
#
import os
@@ -32,6 +32,7 @@ except ImportError:
# this is ugly, hopefully it will be natively supported in up2date
from configfiles import _local_permission_check, _perm_error
from config_common import local_config
+from config_common.rhn_log import set_logfile, log_to_file
sys.path.append('/usr/share/rhn')
from up2date_client import config
@@ -78,6 +79,12 @@ def _create_script_file(script, uid=None, gid=None):
return script_path
+# Make sure the dir-path to a file exists
+def _create_path(fpath):
+ d = os.path.dirname(fpath)
+ if d and not os.path.exists(d):
+ os.makedirs(d, 0700)
+ return os.path.exists(d)
def run(action_id, params, cache_only=None):
@@ -89,13 +96,17 @@ def run(action_id, params, cache_only=None):
logfile_name = local_config.get('script_log_file')
log_output = local_config.get('script_log_file_enable')
+ if log_output:
+ # If we're going to log, make sure we can create the logfile
+ _create_path(logfile_name)
+
if cache_only:
return (0, "no-ops for caching", {})
action_type = 'script.run'
if not _local_permission_check(action_type):
return _perm_error(action_type)
-
+
extras = {'output':''}
script = params.get('script')
@@ -124,7 +135,7 @@ def run(action_id, params, cache_only=None):
db_now = params.get('now')
if not db_now:
return (1, "'now' argument missing", {})
- db_now = time.mktime(time.strptime(db_now, "%Y-%m-%d %H:%M:%S"))
+ db_now = time.mktime(time.strptime(db_now, "%Y-%m-%d %H:%M:%S"))
now = time.time()
process_start = None
@@ -166,7 +177,7 @@ def run(action_id, params, cache_only=None):
if not child_pid:
# Parent doesn't write to child, so close that part
os.close(pipe_read)
-
+
# Redirect both stdout and stderr to the pipe
os.dup2(pipe_write, sys.stdout.fileno())
os.dup2(pipe_write, sys.stderr.fileno())
@@ -179,15 +190,15 @@ def run(action_id, params, cache_only=None):
pass
# all scripts initial working directory will be /
- # puts burden on script writer to ensure cwd is correct within the
+ # puts burden on script writer to ensure cwd is correct within the
# script
os.chdir('/')
-
+
# the child process gets the desired uid/gid
os.setgid(run_as_gid)
os.setuid(uid)
- # give this its own process group (which happens to be equal to its
+ # give this its own process group (which happens to be equal to its
# pid)
os.setpgrp()
@@ -210,7 +221,7 @@ def run(action_id, params, cache_only=None):
while 1:
select_wait = None
-
+
if timeout:
elapsed = time.time() - process_start
@@ -227,12 +238,12 @@ def run(action_id, params, cache_only=None):
# XXX try-except here for interrupted system calls
input_fds, output_fds, error_fds = select.select([pipe_read], [], [], select_wait)
-
+
if error_fds:
# when would this happen?
os.close(pipe_read)
return 1, "Fatal exceptional case", extras
-
+
if not (pipe_read in input_fds):
# Read timed out, should be caught in the next loop
continue
@@ -247,7 +258,7 @@ def run(action_id, params, cache_only=None):
os.close(pipe_read)
# wait for the child to complete
- (somepid, exit_status) = os.waitpid(child_pid, 0)
+ (somepid, exit_status) = os.waitpid(child_pid, 0)
process_end = time.time()
# Copy the output from the temporary file
@@ -266,14 +277,14 @@ def run(action_id, params, cache_only=None):
extras['output'] = base64.encodestring(extras['output'])
extras['return_code'] = exit_status
-
+
# calculate start and end times in db's timespace
extras['process_start'] = db_now + (process_start - now)
extras['process_end'] = db_now + (process_end - now)
for key in ('process_start', 'process_end'):
extras[key] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(extras[key]))
-
+
# clean up the script
os.unlink(script_path)
diff --git a/client/tools/rhncfg/config_client/rhncfg-client.conf b/client/tools/rhncfg/config_client/rhncfg-client.conf
index 51c8856..bfd0065 100644
--- a/client/tools/rhncfg/config_client/rhncfg-client.conf
+++ b/client/tools/rhncfg/config_client/rhncfg-client.conf
@@ -43,4 +43,4 @@ server_url = https://%(server_name)s%(server_handler)s
# Should we store output of a RemoteCommand locally? 1 = yes, 0 = no
script_log_file_enable = 0
# Where will we write that output?
-script_log_file = /var/log/rhn/rhncfg-actions.log
+script_log_file = /var/log/rhn/rhncfg-action-output.log
10 years, 7 months