client/rhel rel-eng/packages
by Michael Mraka
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 29696713b4c34137c66ecf7b912f0bb7fa71b0fc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 5 11:41:10 2011 +0200
Automatic commit of package [yum-rhn-plugin] release [1.6.7-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index c4c3eae..f99ebf0 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.6.6
+Version: 1.6.7
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -72,6 +72,9 @@ fi
%doc LICENSE
%changelog
+* Fri Aug 05 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.7-1
+- parse commandline on our own
+
* Thu Aug 04 2011 Miroslav Suchý 1.6.6-1
- 690616 - fail to rollback if target package is not available
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index d910ea0..70a9813 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.6.6-1 client/rhel/yum-rhn-plugin/
+1.6.7-1 client/rhel/yum-rhn-plugin/
12 years, 9 months
client/rhel
by Michael Mraka
client/rhel/yum-rhn-plugin/rhnplugin.py | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
New commits:
commit b15b3d2c5cfb6ba04380f8da4b896874dbec024c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 5 11:03:06 2011 +0200
parse commandline on our own
optparse can't skip unknown options properly
fixing
Traceback (most recent call last):
File "/usr/bin/yum", line 29, in ?
yummain.user_main(sys.argv[1:], exit_code=True)
...
File "/usr/share/yum-plugins/rhnplugin.py", line 100, in init_hook
(filt_opts, filt_commands) = filt_parser.parse_args()
File "/usr/lib64/python2.4/optparse.py", line 1275, in parse_args
stop = self._process_args(largs, rargs, values)
File "/usr/lib64/python2.4/optparse.py", line 1319, in _process_args
self._process_short_opts(rargs, values)
File "/usr/lib64/python2.4/optparse.py", line 1403, in _process_short_opts
if option.takes_value():
AttributeError: 'NoneType' object has no attribute 'takes_value'
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index c1dc20f..331d79a 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -22,7 +22,6 @@ except ImportError:
pycurl = None
from iniparse import INIConfig
-from optparse import OptionParser
import gettext
t = gettext.translation('yum-rhn-plugin', fallback=True)
@@ -52,10 +51,6 @@ COMMUNICATION_ERROR = _("There was an error communicating with RHN.")
from M2Crypto.SSL import SSLError
-class FilterOptionParser(OptionParser):
- def error(self, msg):
- pass
-
def init_hook(conduit):
"""
Plugin initialization hook. We setup the RHN channels here.
@@ -91,24 +86,23 @@ def init_hook(conduit):
return
# check commands and options which don't need network communication
- filt_parser = FilterOptionParser(add_help_option=False)
- filt_parser.add_option('', '--version', action="store_true")
- filt_parser.add_option('', '--help', action="store_true")
- filt_parser.add_option('-C', '--cacheonly', action="store_true")
- (filt_opts, filt_commands) = filt_parser.parse_args()
- if filt_opts.version or filt_opts.help or filt_commands == []:
+ cmd_args = sys.argv[1:]
+ if ('--help' in cmd_args
+ or '--version' in cmd_args
+ or cmd_args == []):
rhn_enabled = False
conduit.info(10, _("Either --version, --help or no commands entered") +
"\n" + RHN_DISABLED)
return
- if filt_commands[0] == 'clean':
+ if 'clean' in cmd_args:
addCachedRepos(conduit)
conduit.info(10, _("Cleaning") + "\n" + RHN_DISABLED)
# cleanup cached login info
if os.path.exists(pcklAuthFileName):
os.unlink(pcklAuthFileName)
return
- if filt_opts.cacheonly:
+ if ('-C' in cmd_args
+ or '--cacheonly' in cmd_args):
rhn_enabled = False
addCachedRepos(conduit)
conduit.info(10, _("Using list of RHN repos from cache") +
12 years, 9 months
java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java | 24 ++++------
1 file changed, 10 insertions(+), 14 deletions(-)
New commits:
commit a632a65289bf9b2b48f1a85a4abc07b931ce58bf
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Aug 5 11:20:53 2011 +0200
710169 - correct documentation for api.getApiCallList() API call
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
index e892cee..4723aef 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
@@ -101,32 +101,28 @@ public class ApiHandler extends BaseHandler {
* @xmlrpc.doc Lists all available api calls grouped by namespace
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.returntype
- * #array()
- * #array()
- * #struct("method_info")
- * #prop_desc("string", "name", "method name")
- * #prop_desc("string", "parameters", "method parameters")
- * #prop_desc("string", "exceptions", "method exceptions")
- * #prop_desc("string", "return", "method return type")
- * #struct_end()
- * #array_end()
- * #array_end()
+ * #struct("method_info")
+ * #prop_desc("string", "name", "method name")
+ * #prop_desc("string", "parameters", "method parameters")
+ * #prop_desc("string", "exceptions", "method exceptions")
+ * #prop_desc("string", "return", "method return type")
+ * #struct_end()
*/
public Map getApiCallList(String sessionKey) {
- Map callList = new HashMap();
+ Map callHash = new HashMap();
HandlerFactory hf = new HandlerFactory();
Iterator i = getNamespaces().iterator();
while (i.hasNext()) {
String namespace = (String)i.next();
try {
- callList.put(namespace, getApiNamespaceCallList(sessionKey, namespace));
+ callHash.put(namespace, getApiNamespaceCallList(sessionKey, namespace));
}
catch (ClassNotFoundException e) {
- callList.put(namespace, "notFound");
+ callHash.put(namespace, "notFound");
}
}
- return callList;
+ return callHash;
}
/**
12 years, 9 months
Changes to 'refs/tags/spacewalk-monitoring-selinux-1.6.2-1'
by Jan Pazdziora
Tag 'spacewalk-monitoring-selinux-1.6.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-08-05 09:10 +0000
Tagging package [spacewalk-monitoring-selinux] version [1.6.2-1] in directory [selinux/spacewalk-monitoring-selinux/].
Changes since spacewalk-java-1.6.15-1:
Jan Pazdziora (2):
588923 - Allow sendmail to use Mail::Mailer (and send email).
Automatic commit of package [spacewalk-monitoring-selinux] release [1.6.2-1].
Miroslav Suchý (2):
710152 - correct documentation for api.getApiNamespaces() API call
710162 - correct documentation for api.getApiNamespaceCallList() API call
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java | 30 ++++------
rel-eng/packages/spacewalk-monitoring-selinux | 2
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 5 +
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te | 2
4 files changed, 20 insertions(+), 19 deletions(-)
---
12 years, 9 months
rel-eng/packages selinux/spacewalk-monitoring-selinux
by Jan Pazdziora
rel-eng/packages/spacewalk-monitoring-selinux | 2 +-
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 34d3055c11c8c27b098d16475a77fbdacf704695
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Aug 5 11:10:05 2011 +0200
Automatic commit of package [spacewalk-monitoring-selinux] release [1.6.2-1].
diff --git a/rel-eng/packages/spacewalk-monitoring-selinux b/rel-eng/packages/spacewalk-monitoring-selinux
index faef1a8..6a52b2b 100644
--- a/rel-eng/packages/spacewalk-monitoring-selinux
+++ b/rel-eng/packages/spacewalk-monitoring-selinux
@@ -1 +1 @@
-1.6.1-1 selinux/spacewalk-monitoring-selinux/
+1.6.2-1 selinux/spacewalk-monitoring-selinux/
diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
index df9d756..52fae66 100644
--- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
+++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
@@ -7,7 +7,7 @@
%define modulename spacewalk-monitoring
Name: spacewalk-monitoring-selinux
-Version: 1.6.1
+Version: 1.6.2
Release: 1%{?dist}
Summary: SELinux policy module supporting Spacewalk monitoring
@@ -142,6 +142,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Fri Aug 05 2011 Jan Pazdziora 1.6.2-1
+- 588923 - Allow sendmail to use Mail::Mailer (and send email).
+
* Thu Jul 21 2011 Jan Pazdziora 1.6.1-1
- Revert "Fedora 15 uses oracledb_port_t instead of oracle_port_t."
12 years, 9 months
selinux/spacewalk-monitoring-selinux
by Jan Pazdziora
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit afd9db44bbae4e9abda70a4ec1fecea7c0dab69b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Aug 5 10:56:03 2011 +0200
588923 - Allow sendmail to use Mail::Mailer (and send email).
Addressing
avc: denied { getattr } for pid=10428 comm="perl" path="/usr/sbin/sendmail.sendmail" dev=dm-0 ino=2279343 scontext=root:system_r:spacewalk_monitoring_t:s0 tcontext=system_u:object_r:sendmail_exec_t:s0 tclass=file
diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
index ecc81b5..216b9f8 100644
--- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
+++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
@@ -173,3 +173,5 @@ optional_policy(`
')
allow spacewalk_monitoring_t oracle_port_t:tcp_socket name_connect;
')
+
+mta_send_mail(spacewalk_monitoring_t)
12 years, 9 months
java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java | 14 ++++------
1 file changed, 6 insertions(+), 8 deletions(-)
New commits:
commit ddabb3cd72bc112dafec6b92daf429d06fd4c13f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Aug 5 10:56:29 2011 +0200
710162 - correct documentation for api.getApiNamespaceCallList() API call
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
index a1856f9..e892cee 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
@@ -140,14 +140,12 @@ public class ApiHandler extends BaseHandler {
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("string", "namespace")
* @xmlrpc.returntype
- * #array()
- * #struct("method_info")
- * #prop_desc("string", "name", "method name")
- * #prop_desc("string", "parameters", "method parameters")
- * #prop_desc("string", "exceptions", "method exceptions")
- * #prop_desc("string", "return", "method return type")
- * #struct_end()
- * #array_end()
+ * #struct("method_info")
+ * #prop_desc("string", "name", "method name")
+ * #prop_desc("string", "parameters", "method parameters")
+ * #prop_desc("string", "exceptions", "method exceptions")
+ * #prop_desc("string", "return", "method return type")
+ * #struct_end()
*/
public Map getApiNamespaceCallList(String sessionKey, String namespace)
throws ClassNotFoundException {
12 years, 9 months
java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java | 16 ++++------
1 file changed, 7 insertions(+), 9 deletions(-)
New commits:
commit f95fdfd251525d86ef8c660fadccc5208643dc25
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Aug 5 10:53:14 2011 +0200
710152 - correct documentation for api.getApiNamespaces() API call
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
index be6aaa3..a1856f9 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/api/ApiHandler.java
@@ -75,24 +75,22 @@ public class ApiHandler extends BaseHandler {
* @xmlrpc.doc Lists available API namespaces
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.returntype
- * #array()
- * #struct("namespace")
- * #prop_desc("string", "namespace", "API namespace")
- * #prop_desc("string", "handler", "API Handler")
- * #struct_end()
- * #array_end()
+ * #struct("namespace")
+ * #prop_desc("string", "namespace", "API namespace")
+ * #prop_desc("string", "handler", "API Handler")
+ * #struct_end()
*/
public Map getApiNamespaces(String sessionKey) {
- Map namespacesList = new HashMap();
+ Map namespacesHash = new HashMap();
HandlerFactory hf = new HandlerFactory();
Iterator i = getNamespaces().iterator();
while (i.hasNext()) {
String namespace = (String)i.next();
- namespacesList.put(namespace, StringUtil.getClassNameNoPackage(
+ namespacesHash.put(namespace, StringUtil.getClassNameNoPackage(
hf.getHandler(namespace).getClass()));
}
- return namespacesList;
+ return namespacesHash;
}
/**
12 years, 9 months
Changes to 'refs/tags/spacewalk-java-1.6.15-1'
by Miroslav Suchý
Tag 'spacewalk-java-1.6.15-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-08-05 07:36 +0000
Tagging package [spacewalk-java] version [1.6.15-1] in directory [java/].
Changes since spacewalk-web-1.6.8-1:
Miroslav Suchý (2):
checkstyle - Line is longer than 92 characters.
Automatic commit of package [spacewalk-java] release [1.6.15-1].
---
java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java | 3 ++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
12 years, 9 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java | 3 ++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 2e34784d0a056c574d7d7f4d447ee659c44650a6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Aug 5 09:36:15 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.15-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 95f9566..accae31 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.14
+Version: 1.6.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Aug 05 2011 Miroslav Suchý 1.6.15-1
+- checkstyle - Line is longer than 92 characters.
+
* Thu Aug 04 2011 Aron Parsons <aparsons(a)redhat.com> 1.6.14-1
- add support for custom messages in the header, footer and login pages
(aparsons(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 673583f..6915f8c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.14-1 java/
+1.6.15-1 java/
commit 2c6b83a6114819617ec3e2e904fa58aff267604f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Aug 5 09:36:04 2011 +0200
checkstyle - Line is longer than 92 characters.
addressing build errors:
+ xargs checkstyle -c buildconf/checkstyle.xml
Starting audit...
./code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java:48: Line is longer than 92 characters.
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java
index f86997a..39af806 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java
@@ -45,7 +45,8 @@ public class RhnUnpagedListAction extends RhnAction {
}
String filterData = request.getParameter(RequestContext.FILTER_STRING);
- request.setAttribute("isFiltered", Boolean.valueOf(!StringUtils.isEmpty(filterData)));
+ request.setAttribute("isFiltered",
+ Boolean.valueOf(!StringUtils.isEmpty(filterData)));
lc.setFilterData(filterData);
}
12 years, 9 months