Changes to 'refs/tags/rhnpush-5.5.51-1'
by Michael Mraka
Tag 'rhnpush-5.5.51-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-08-21 16:17 +0000
Tagging package [rhnpush] version [5.5.51-1] in directory [client/tools/rhnpush/].
Changes since spacewalk-java-1.8.131-1:
Michael Mraka (10):
fixed PackageUpload.get_error_message: Unused variable 'fault_code'
fixed PackageUpload.upload: Attribute 'checksum' defined outside __init__ PackageUpload.upload: Attribute 'nvra' defined outside __init__ PackageUpload.send_http: Attribute '_resp_headers' defined outside __init__ PackageUpload.upload: Attribute 'packaging' defined outside __init__ PackageUpload.upload: Attribute 'checksum_type' defined outside __init__ PackageUpload.upload: Attribute '_response' defined outside __init__
fixed PackageUpload.upload: Invalid name "FileChecksumType" (should match [a-z_][a-zA-Z0-9_]{,30}$) PackageUpload.upload: Invalid name "FileChecksum" (should match [a-z_][a-zA-Z0-9_]{,30}$)
fixed BaseConnection.parse_url: Method could be a function
locally disabled BaseConnection: Too many instance attributes (10/7) PackageUpload: Too many instance attributes (13/7)
fixed PackageUpload.get_error_message: Unused variable 'errcodestr'
fixed Too many arguments for format string
fixed rhnpushConfigParser.__getitem__: Instance of 'ConfigParser' has no 'get_option' member
removed dead ConfManager._write_config_file()
Automatic commit of package [rhnpush] release [5.5.51-1].
Tomas Lestach (2):
849101 - do not validate initialized value
849101 - anonymous proxy does not need proxyUser and proxyPassword
---
client/tools/rhnpush/connection.py | 57 ++++++++++++++--------------
client/tools/rhnpush/rhnpush.spec | 6 ++
client/tools/rhnpush/rhnpush_config.py | 6 +-
client/tools/rhnpush/rhnpush_confmanager.py | 13 ------
rel-eng/packages/rhnpush | 2
satellite/install/install.pl | 4 +
6 files changed, 41 insertions(+), 47 deletions(-)
---
11 years, 8 months
10 commits - client/tools rel-eng/packages
by Michael Mraka
client/tools/rhnpush/connection.py | 57 ++++++++++++++--------------
client/tools/rhnpush/rhnpush.spec | 6 ++
client/tools/rhnpush/rhnpush_config.py | 6 +-
client/tools/rhnpush/rhnpush_confmanager.py | 13 ------
rel-eng/packages/rhnpush | 2
5 files changed, 38 insertions(+), 46 deletions(-)
New commits:
commit 253c09fde2e534401bc1bcebd8fe12399b3250f2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 21 18:17:01 2012 +0200
Automatic commit of package [rhnpush] release [5.5.51-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 67c02e0..a89b143 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -4,7 +4,7 @@ Name: rhnpush
Group: Applications/System
License: GPLv2
URL: http://fedorahosted.org/spacewalk
-Version: 5.5.50
+Version: 5.5.51
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING
%changelog
+* Tue Aug 21 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.5.51-1
+- removed dead code
+- fixed pylint errors
+
* Wed Jul 25 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.5.50-1
- fixed pylint warnings and errors
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush
index 3127ab3..dc30227 100644
--- a/rel-eng/packages/rhnpush
+++ b/rel-eng/packages/rhnpush
@@ -1 +1 @@
-5.5.50-1 client/tools/rhnpush/
+5.5.51-1 client/tools/rhnpush/
commit 81bac2f130eae2cd4e4177a0b3c5c39854766d8d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 21 14:23:13 2012 +0200
removed dead ConfManager._write_config_file()
moreover it fixed ConfManager._write_config_file: Method could be a function
diff --git a/client/tools/rhnpush/rhnpush_confmanager.py b/client/tools/rhnpush/rhnpush_confmanager.py
index a97dbc9..2324981 100644
--- a/client/tools/rhnpush/rhnpush_confmanager.py
+++ b/client/tools/rhnpush/rhnpush_confmanager.py
@@ -35,19 +35,6 @@ class ConfManager:
self.cmdconfig = optionparser
self.store_true_list = store_true_list
- #1/3/06 wregglej 172376 rhnpush shouldn't gag, choke, and die when trying to write the
- #local config file on a read-only filesystem. Plus, I redid the writing of the config files
- #to avoid duping code.
- #2/20/06 wregglej, but apparently it didn't occur to me to remove a completely redundant try-catch.
- def _write_config_file(self, cfg_filename, config_obj):
- #Just skip writing the config file if access is denied. rhnpush is probably being run
- #on a read-only filesystem, which is supported.
- cfg_dir = os.path.split(cfg_filename)[0]
- if os.access(cfg_dir, os.W_OK):
- new_config_file = open(cfg_filename, "w+")
- config_obj.write(new_config_file)
- new_config_file.close()
-
#Change the files options of the self.userconfig
#Change the exclude options of the self.userconfig
def _files_to_list(self):
commit 52f7d75d3cbf69366ef9e48d08d090e1aab6056a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 21 14:17:05 2012 +0200
fixed rhnpushConfigParser.__getitem__: Instance of 'ConfigParser' has no 'get_option' member
diff --git a/client/tools/rhnpush/rhnpush_config.py b/client/tools/rhnpush/rhnpush_config.py
index 3034e46..324b52c 100644
--- a/client/tools/rhnpush/rhnpush_config.py
+++ b/client/tools/rhnpush/rhnpush_config.py
@@ -116,7 +116,7 @@ class rhnpushConfigParser:
#Returns an option read in from the configuration files.
def __getitem__(self, item):
- return self.settings.get_option(item)
+ return self.get_option(item)
#Takes all of the configuration options read in by the ConfigParser and makes them attributes of the object.
def _add_config_as_attr(self, ensure_consistency=False):
commit 1d034b50ebb949e68a59b4295c996a4141beccfb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 21 14:13:14 2012 +0200
fixed Too many arguments for format string
diff --git a/client/tools/rhnpush/rhnpush_config.py b/client/tools/rhnpush/rhnpush_config.py
index 93e8dd8..3034e46 100644
--- a/client/tools/rhnpush/rhnpush_config.py
+++ b/client/tools/rhnpush/rhnpush_config.py
@@ -82,14 +82,14 @@ class rhnpushConfigParser:
try:
self.settings.read([self.filename])
except IOError, e:
- print "Config File Error: line %s, file %s: $s" % (e.lineno, e.filename, e)
+ print "Config File Error: line %s, file %s: %s" % (e.lineno, e.filename, e)
sys.exit(1)
def write(self, fileobj):
try:
self.settings.write(fileobj)
except IOError, e:
- print "Config File Error: line %s, file %s: $s" % (e.lineno, e.filename, e)
+ print "Config File Error: line %s, file %s: %s" % (e.lineno, e.filename, e)
sys.exit(1)
commit 139486f1d51e0fb09bed98933aa545031166d6e5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 21 14:11:44 2012 +0200
fixed PackageUpload.get_error_message: Unused variable 'errcodestr'
diff --git a/client/tools/rhnpush/connection.py b/client/tools/rhnpush/connection.py
index e69cde4..b82e4c3 100644
--- a/client/tools/rhnpush/connection.py
+++ b/client/tools/rhnpush/connection.py
@@ -255,7 +255,6 @@ class PackageUpload:
def get_error_message(self, headers):
prefix = self.header_prefix + '-Error'
- errcodestr = prefix + "-Code"
text = map(lambda x: x[1], headers.getaddrlist(prefix + '-String'))
# text is a list now, convert it to a string
text = '\n'.join(text)
commit cdda6393da4332f68bb7363200dd444705c3bd13
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 21 14:11:05 2012 +0200
locally disabled BaseConnection: Too many instance attributes (10/7) PackageUpload: Too many instance attributes (13/7)
diff --git a/client/tools/rhnpush/connection.py b/client/tools/rhnpush/connection.py
index 8657343..e69cde4 100644
--- a/client/tools/rhnpush/connection.py
+++ b/client/tools/rhnpush/connection.py
@@ -28,7 +28,7 @@ from spacewalk.common.rhn_pkg import InvalidPackageError, package_from_filename
class ConnectionError(Exception):
pass
-
+# pylint: disable=R0902
class BaseConnection:
def __init__(self, uri, proxy=None):
self._scheme, (self._host, self._port), self._path = parse_url(uri)[:3]
commit 8a361df4303ca3e786045c045bf0cd92c6fa31f1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 21 14:07:57 2012 +0200
fixed BaseConnection.parse_url: Method could be a function
diff --git a/client/tools/rhnpush/connection.py b/client/tools/rhnpush/connection.py
index 49fdc94..8657343 100644
--- a/client/tools/rhnpush/connection.py
+++ b/client/tools/rhnpush/connection.py
@@ -31,7 +31,7 @@ class ConnectionError(Exception):
class BaseConnection:
def __init__(self, uri, proxy=None):
- self._scheme, (self._host, self._port), self._path = self.parse_url(uri)[:3]
+ self._scheme, (self._host, self._port), self._path = parse_url(uri)[:3]
if proxy:
arr = rpclib.get_proxy_info(proxy)
@@ -81,24 +81,6 @@ class BaseConnection:
return getattr(self._connection, name)
- def parse_url(self, url, scheme="http", path='/'):
- _scheme, netloc, _path, params, query, fragment = urlparse.urlparse(url)
- if not netloc:
- # No scheme - trying to patch it up ourselves?
- url = scheme + "://" + url
- _scheme, netloc, _path, params, query, fragment = urlparse.urlparse(url)
-
- if not netloc:
- # XXX
- raise Exception()
-
- (host, port) = urllib.splitport(netloc)
-
- if not _path:
- _path = path
-
- return (_scheme, (host, port), _path, params, query, fragment)
-
class PackageUpload:
header_prefix = "X-RHN-Upload"
user_agent = "rhn-package-upload"
@@ -279,3 +261,21 @@ class PackageUpload:
text = '\n'.join(text)
text = base64.decodestring(text)
return text
+
+def parse_url(url, scheme="http", path='/'):
+ _scheme, netloc, _path, params, query, fragment = urlparse.urlparse(url)
+ if not netloc:
+ # No scheme - trying to patch it up ourselves?
+ url = scheme + "://" + url
+ _scheme, netloc, _path, params, query, fragment = urlparse.urlparse(url)
+
+ if not netloc:
+ # XXX
+ raise Exception()
+
+ (host, port) = urllib.splitport(netloc)
+
+ if not _path:
+ _path = path
+
+ return (_scheme, (host, port), _path, params, query, fragment)
commit 2c5c8d2dc3c8c10c9235d3a4a25050a5335ac1c6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 21 13:59:34 2012 +0200
fixed PackageUpload.upload: Invalid name "FileChecksumType" (should match [a-z_][a-zA-Z0-9_]{,30}$) PackageUpload.upload: Invalid name "FileChecksum" (should match [a-z_][a-zA-Z0-9_]{,30}$)
diff --git a/client/tools/rhnpush/connection.py b/client/tools/rhnpush/connection.py
index 10742cf..49fdc94 100644
--- a/client/tools/rhnpush/connection.py
+++ b/client/tools/rhnpush/connection.py
@@ -175,7 +175,7 @@ class PackageUpload:
return self._response
- def upload(self, filename, FileChecksumType, FileChecksum):
+ def upload(self, filename, fileChecksumType, fileChecksum):
"""
Uploads a file.
Returns (http_error_code, error_message)
@@ -216,8 +216,8 @@ class PackageUpload:
self.nvra = nvra
# use the precomputed passed checksum
- self.checksum_type = FileChecksumType
- self.checksum = FileChecksum
+ self.checksum_type = fileChecksumType
+ self.checksum = fileChecksum
# Set headers
self.set_header("Content-Type", "application/x-rpm")
commit ccc5d0167528d75ca99fe8b4d94a97f9233cdfb8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 21 13:53:46 2012 +0200
fixed PackageUpload.upload: Attribute 'checksum' defined outside __init__ PackageUpload.upload: Attribute 'nvra' defined outside __init__ PackageUpload.send_http: Attribute '_resp_headers' defined outside __init__ PackageUpload.upload: Attribute 'packaging' defined outside __init__ PackageUpload.upload: Attribute 'checksum_type' defined outside __init__ PackageUpload.upload: Attribute '_response' defined outside __init__
diff --git a/client/tools/rhnpush/connection.py b/client/tools/rhnpush/connection.py
index 4e86840..10742cf 100644
--- a/client/tools/rhnpush/connection.py
+++ b/client/tools/rhnpush/connection.py
@@ -110,6 +110,12 @@ class PackageUpload:
self.package_version = None
self.package_release = None
self.package_arch = None
+ self.checksum = None
+ self.checksum_type = None
+ self.nvra = None
+ self._resp_headers = None
+ self.packaging = None
+ self._response = None
def set_header(self, name, value):
if not self.headers.has_key(name):
commit 0f9a93ea5d9cda98bf91382cc9193a2c26039795
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 21 13:51:48 2012 +0200
fixed PackageUpload.get_error_message: Unused variable 'fault_code'
diff --git a/client/tools/rhnpush/connection.py b/client/tools/rhnpush/connection.py
index 449d303..4e86840 100644
--- a/client/tools/rhnpush/connection.py
+++ b/client/tools/rhnpush/connection.py
@@ -268,10 +268,6 @@ class PackageUpload:
def get_error_message(self, headers):
prefix = self.header_prefix + '-Error'
errcodestr = prefix + "-Code"
- if headers.has_key(errcodestr):
- fault_code = headers[errcodestr]
- else:
- fault_code = None
text = map(lambda x: x[1], headers.getaddrlist(prefix + '-String'))
# text is a list now, convert it to a string
text = '\n'.join(text)
11 years, 8 months
2 commits - satellite/install
by Tomas Lestach
satellite/install/install.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 0272e75592f6d20b2c31b86d51e878c0f4c7f3e3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Aug 21 16:53:11 2012 +0200
849101 - anonymous proxy does not need proxyUser and proxyPassword
addressing:
Use of uninitialized value in concatenation (.) or string at ./install.pl line 314, <STDIN> line 2.
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index a91d0ec..af4df85 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -329,6 +329,8 @@ sub rhn_register {
-password => 1);
if ($up2dateopts->{'httpProxy'}) {
+ $up2dateopts->{'proxyUser'} ||= '';
+ $up2dateopts->{'proxyPassword'} ||= '';
ask(-question => "The following proxy information was found in use by up2date:
Proxy Hostname: $up2dateopts->{'httpProxy'}
Proxy Username: $up2dateopts->{'proxyUser'}
commit a723e772dd82f7a4c8fba16fde51c7e6f161d6b0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Aug 21 16:13:25 2012 +0200
849101 - do not validate initialized value
addressing:
'' is not a valid response
when httpProxy is defined in the up2date file
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 544f2b4..a91d0ec 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -302,7 +302,7 @@ sub rhn_register {
my $opts = shift;
my $answers = shift;
my $up2dateopts = shift;
- my $proxyAccept = '';
+ my $proxyAccept;
if ($opts->{disconnected}) {
print loc("** Registration: Disconnected mode. Not registering with RHN.\n");
11 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.8.131-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-1.8.131-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2012-08-21 12:21 +0000
Tagging package [spacewalk-java] version [1.8.131-1] in directory [java/].
Changes since spacewalk-java-1.8.130-1:
Tomas Kasparek (2):
846215 - Kickstarts profile visible where they should be
Automatic commit of package [spacewalk-java] release [1.8.131-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 5 +++--
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
11 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6db792db6ce2cc3b7f3d118e80647b5053172537
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Aug 21 14:21:52 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.131-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index eb5334b..df7d1e3 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.130
+Version: 1.8.131
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Aug 21 2012 Tomas Kasparek <tkasparek(a)redhat.com> 1.8.131-1
+- 846215 - Kickstarts profile visible where they should be
+
* Mon Aug 20 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.130-1
- 198887 - checkstyle fixes
- 198887 - introducing a possibility to delete archived actions
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0118cdd..d576d20 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.130-1 java/
+1.8.131-1 java/
11 years, 8 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit fda9666bca65b0babd37dbe89d5517193f15d556
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Aug 21 10:38:20 2012 +0200
846215 - Kickstarts profile visible where they should be
Chnaged SQL Querry to show only relevant kickstarts profiles in System/Provisioning page
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
index f520d28..f9622b1 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
@@ -36,8 +36,9 @@
WHERE KS.org_id = :org_id
AND KS.active = 'Y'
AND ( C.channel_arch_id = :prim_arch_id OR C.channel_arch_id = :sec_arch_id )
- AND ( KVT.label != 'xenpv'
- OR KVT.label IS NULL)
+ AND ( KVT.label = 'none'
+ OR KVT.label = 'para_host'
+ OR KVT.label IS NULL)
AND KS.cobbler_id IS NOT NULL
ORDER BY KS.label, KS.id
</query>
11 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.8.130-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.130-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-08-20 12:47 +0000
Tagging package [spacewalk-java] version [1.8.130-1] in directory [java/].
Changes since spacewalk-proxy-1.8.10-1:
Jan Pazdziora (1):
812886 - the Enhancement Advisory is actually Product Enhancement Advisory.
Johannes Renner (1):
Fix missing CVEs in patches listing with Oracle 11
Stephen Herr (2):
848368 - make IE use IE7 compatability mode for pages with editarea
849219 - don't explain the error about not subscribing proxy channels
Tomas Lestach (3):
198887 - introducing a possibility to delete archived actions
198887 - checkstyle fixes
Automatic commit of package [spacewalk-java] release [1.8.130-1].
---
backend/server/handlers/xmlrpc/up2date.py | 2
java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml | 4
java/code/src/com/redhat/rhn/domain/action/server/ServerAction.hbm.xml | 3
java/code/src/com/redhat/rhn/frontend/action/schedule/ArchivedActionsSetupAction.java | 87 +++++++---
java/code/src/com/redhat/rhn/frontend/action/schedule/BaseScheduledListAction.java | 1
java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 24 ++
java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidActionTypeException.java | 8
java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java | 17 +
java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 29 +++
java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java | 4
java/code/webapp/WEB-INF/decorators/layout_head.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp | 66 -------
java/code/webapp/WEB-INF/struts-config.xml | 5
java/spacewalk-java.spec | 9 -
rel-eng/packages/spacewalk-java | 2
utils/apply_errata | 2
17 files changed, 176 insertions(+), 93 deletions(-)
---
11 years, 8 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidActionTypeException.java | 4 ++++
java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 4 ++--
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 1bafa94eb3de096c560ad0bb49c45f27f07c0987
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Aug 20 14:47:29 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.130-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 03e0cc3..eb5334b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.129
+Version: 1.8.130
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Aug 20 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.130-1
+- 198887 - checkstyle fixes
+- 198887 - introducing a possibility to delete archived actions
+- 848368 - make IE use IE7 compatability mode for pages with editarea
+- Fix missing CVEs in patches listing with Oracle 11
+- 848036 - fix icons on SSM provisioning page
+
* Wed Aug 15 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.129-1
- 848036 - fix icons on SSM system list page
- 785088 - validate virt guest parameters also for API input
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f47c347..0118cdd 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.129-1 java/
+1.8.130-1 java/
commit f04c4cfe210dc1d5b6895abdfa7b90c2d6f34187
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Aug 20 11:51:44 2012 +0200
198887 - checkstyle fixes
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidActionTypeException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidActionTypeException.java
index 2d6914c..421aa80 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidActionTypeException.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidActionTypeException.java
@@ -43,6 +43,10 @@ public class InvalidActionTypeException extends FaultException {
getMessage("api.action.invalidactiontype"), cause);
}
+ /**
+ * Constructor
+ * @param msg (unlocalized) exception message to be displayed
+ */
public InvalidActionTypeException(String msg) {
super(2701, "invalidActionType", msg);
}
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index 7c46cee..5467c64 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -267,11 +267,11 @@ public class ActionManager extends BaseManager {
* Deletes the archived actions
*
* @param user User requesting the delete action
- * @param actionIds List of action ids to be deleted
+ * @param actionsIds List of action ids to be deleted
*/
public static void deleteActionsById(User user, List actionsIds) {
List<Action> actions = new ArrayList<Action>();
- for (Iterator<Number> ai = actionsIds.iterator(); ai.hasNext(); ){
+ for (Iterator<Number> ai = actionsIds.iterator(); ai.hasNext();) {
long actionId = ai.next().longValue();
Action action = ActionManager.lookupAction(user, actionId);
if (action != null) {
11 years, 8 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml | 4
java/code/src/com/redhat/rhn/domain/action/server/ServerAction.hbm.xml | 3
java/code/src/com/redhat/rhn/frontend/action/schedule/ArchivedActionsSetupAction.java | 87 +++++++---
java/code/src/com/redhat/rhn/frontend/action/schedule/BaseScheduledListAction.java | 1
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 24 ++
java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidActionTypeException.java | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java | 17 +
java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 29 +++
java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java | 4
java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp | 66 -------
java/code/webapp/WEB-INF/struts-config.xml | 5
11 files changed, 156 insertions(+), 88 deletions(-)
New commits:
commit 40fcee59bcd492e43588a7099af5629a3d482c58
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 16 12:14:53 2012 +0200
198887 - introducing a possibility to delete archived actions
diff --git a/java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml b/java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml
index 571435f..77983ee 100644
--- a/java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/action/Action_legacyUser.hbm.xml
@@ -27,10 +27,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<many-to-one name="schedulerUser"
class="com.redhat.rhn.domain.user.legacy.UserImpl"
- column="scheduler" update="true" insert="true" cascade="all" />
+ column="scheduler" />
<many-to-one name="actionType"
class="com.redhat.rhn.domain.action.ActionType"
- column="action_type" cascade="all" update="false" />
+ column="action_type" />
<set name="serverActions" outer-join="false" cascade="all" lazy="true"
inverse="true" order-by="modified asc">
<key column="action_id"/>
diff --git a/java/code/src/com/redhat/rhn/domain/action/server/ServerAction.hbm.xml b/java/code/src/com/redhat/rhn/domain/action/server/ServerAction.hbm.xml
index eeb6268..588c82a 100644
--- a/java/code/src/com/redhat/rhn/domain/action/server/ServerAction.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/action/server/ServerAction.hbm.xml
@@ -23,8 +23,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="remainingTries" column="remaining_tries" type="long" />
<many-to-one name="status"
class="com.redhat.rhn.domain.action.ActionStatus"
- column="status"
- cascade="all" />
+ column="status" />
<!-- we do this so that we don't have to load the whole server object as a key which is very expensive
this is the reason for insert="false" update="false" -->
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/ArchivedActionsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/ArchivedActionsSetupAction.java
index fb2cd04..f64c683 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/ArchivedActionsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/ArchivedActionsSetupAction.java
@@ -14,17 +14,23 @@
*/
package com.redhat.rhn.frontend.action.schedule;
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.domain.rhnset.RhnSet;
+import com.redhat.rhn.domain.rhnset.RhnSetElement;
+import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.frontend.struts.RhnHelper;
-import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
-import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
+import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.action.ActionManager;
+import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import com.redhat.rhn.manager.rhnset.RhnSetManager;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import java.util.LinkedList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -34,31 +40,70 @@ import javax.servlet.http.HttpServletResponse;
* ArchivedActionsSetupAction
* @version $Rev$
*/
-public class ArchivedActionsSetupAction extends RhnAction implements Listable {
+public class ArchivedActionsSetupAction extends BaseScheduledListAction {
/**
*
* {@inheritDoc}
*/
- public ActionForward execute(ActionMapping mapping,
- ActionForm formIn,
- HttpServletRequest request,
- HttpServletResponse response) {
-
- RequestContext context = new RequestContext(request);
- ListHelper helper = new ListHelper(this, request);
- helper.execute();
-
- return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ protected RhnSetDecl getSetDecl() {
+ return RhnSetDecl.ACTIONS_ARCHIVED;
}
/**
- *
- * {@inheritDoc}
- */
- public List getResult(RequestContext context) {
- return ActionManager.archivedActions(context.getCurrentUser(), null);
- }
+ *
+ * {@inheritDoc}
+ */
+ public List getResult(RequestContext context) {
+ return ActionManager.archivedActions(context.getLoggedInUser(), null);
+ }
+
+ /**
+ *
+ * {@inheritDoc}
+ */
+ protected ActionForward handleSubmit(ActionMapping mapping,
+ ActionForm formIn, HttpServletRequest request,
+ HttpServletResponse response) {
+ RequestContext requestContext = new RequestContext(request);
+ StrutsDelegate strutsDelegate = getStrutsDelegate();
+
+ User user = requestContext.getLoggedInUser();
+ RhnSet set = getSetDecl().get(user);
+
+
+ List actionIdsToDelete = new LinkedList();
+
+ for (RhnSetElement element : set.getElements()) {
+ actionIdsToDelete.add(element.getElement());
+ }
+
+ ActionManager.deleteActionsById(user, actionIdsToDelete);
+
+
+ ActionMessages msgs = new ActionMessages();
+ // If there was only one action cancelled, display the "action" cancelled
+ // message, else display the "actions" archived message.
+ if (set.size() == 1) {
+ msgs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("message.actionDeleted",
+ LocalizationService.getInstance()
+ .formatNumber(new Integer(set.size()))));
+ }
+ else {
+ msgs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("message.actionsDeleted",
+ LocalizationService.getInstance()
+ .formatNumber(new Integer(set.size()))));
+ }
+ strutsDelegate.saveMessages(request, msgs);
+
+ set.clear();
+ RhnSetManager.store(set);
+
+
+ return mapping.findForward("success");
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/BaseScheduledListAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/BaseScheduledListAction.java
index d69d085..416e854 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/BaseScheduledListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/BaseScheduledListAction.java
@@ -132,5 +132,4 @@ public abstract class BaseScheduledListAction extends RhnAction implements Lista
return mapping.findForward("archive");
}
-
}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index c3476b3..bd98576 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -769,6 +769,24 @@
</context>
</context-group>
</trans-unit>
+ <trans-unit id="message.actionDeleted">
+<source><strong>{0}</strong> action deleted.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/schedule/ArchivedActions</context>
+ <context context-type="paramnotes">
+ 1 action deleted.
+ </context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="message.actionsDeleted">
+<source><strong>{0}</strong> actions deleted.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/schedule/ArchivedActions</context>
+ <context context-type="paramnotes">
+ 2 actions deleted.
+ </context>
+ </context-group>
+ </trans-unit>
<trans-unit id="relogin.jsp.pleasesignin">
<source>Please Sign In</source>
<context-group name="ctx">
@@ -2187,6 +2205,12 @@ button below, and <b>will be unable to log back in</b>.</source>
<context context-type="sourcefile">/rhn/schedule/PendingActions</context>
</context-group>
</trans-unit>
+ <trans-unit id="actions.jsp.deleteactions">
+<source>Delete Actions</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/schedule/ArchivedActions</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="actions.jsp.archiveactions">
<source>Archive Actions</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidActionTypeException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidActionTypeException.java
index b277170..2d6914c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidActionTypeException.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidActionTypeException.java
@@ -42,4 +42,8 @@ public class InvalidActionTypeException extends FaultException {
super(2701, "invalidActionType", LocalizationService.getInstance().
getMessage("api.action.invalidactiontype"), cause);
}
+
+ public InvalidActionTypeException(String msg) {
+ super(2701, "invalidActionType", msg);
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java
index 4849f17..b0f2d70 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java
@@ -320,6 +320,23 @@ public class ScheduleHandler extends BaseHandler {
return 1;
}
+ /**
+ * Delete all archived actions in the given list.
+ * @param sessionKey The sessionkey for the session containing the logged in user.
+ * @param actionIds The list of ids for actions to delete.
+ * @return Returns a integer 1 on success
+ * @throws FaultException In case of an error
+ *
+ * @xmlrpc.doc Delete all archived actions in the given list.
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #array_single("int", "action id")
+ * @xmlrpc.returntype #return_int_success()
+ */
+ public int deleteActions(String sessionKey, List<Integer> actionIds) {
+ User user = getLoggedInUser(sessionKey);
+ ActionManager.deleteActionsById(user, actionIds);
+ return 1;
+ }
}
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index ede85c5..7c46cee 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -64,6 +64,7 @@ import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.PackageMetadata;
import com.redhat.rhn.frontend.listview.PageControl;
+import com.redhat.rhn.frontend.xmlrpc.InvalidActionTypeException;
import com.redhat.rhn.manager.BaseManager;
import com.redhat.rhn.manager.MissingCapabilityException;
import com.redhat.rhn.manager.MissingEntitlementException;
@@ -222,7 +223,7 @@ public class ActionManager extends BaseManager {
/**
* Cancels the server actions associated with a given action, and if
- * required deals with assicuated pending kickstart actions.
+ * required deals with associated pending kickstart actions.
*
* Actions themselves are not deleted, only the ServerActions associated
* with them.
@@ -263,6 +264,32 @@ public class ActionManager extends BaseManager {
}
/**
+ * Deletes the archived actions
+ *
+ * @param user User requesting the delete action
+ * @param actionIds List of action ids to be deleted
+ */
+ public static void deleteActionsById(User user, List actionsIds) {
+ List<Action> actions = new ArrayList<Action>();
+ for (Iterator<Number> ai = actionsIds.iterator(); ai.hasNext(); ){
+ long actionId = ai.next().longValue();
+ Action action = ActionManager.lookupAction(user, actionId);
+ if (action != null) {
+ // check, whether the actions are archived
+ if (action.getArchived() == 0) {
+ throw new InvalidActionTypeException(
+ "Archive following action before deletion: " + action.getId());
+ }
+ actions.add(action);
+ }
+ }
+ // now, delete them
+ for (Action action : actions) {
+ ActionFactory.remove(action);
+ }
+ }
+
+ /**
* Adds a server to an action
* @param sid The server id
* @param action The parent action
diff --git a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
index 99fafa6..2247446 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
@@ -53,6 +53,10 @@ public class RhnSetDecl {
SetCleanup.UNOWNED_ACTIONS);
// set of actions by action_id
+ public static final RhnSetDecl ACTIONS_ARCHIVED = make("archived_action_list",
+ SetCleanup.UNOWNED_ACTIONS);
+
+ // set of actions by action_id
public static final RhnSetDecl ACTIONS_PENDING = make(
"pending_action_list", SetCleanup.UNOWNED_ACTIONS);
diff --git a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
index db5c513..f68d583 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
@@ -27,71 +27,17 @@
<rhn:csrf />
<rl:list emptykey="archivedactions.jsp.nogroups" styleclass="list">
- <rl:decorator name="PageSizeDecorator"/>
- <rl:decorator name="ElaborationDecorator"/>
- <rl:column sortable="true"
- bound="false"
- headerkey="actions.jsp.action"
- sortattr="actionName"
- styleclass="list-fat-column-50"
- filterattr="actionName">
- <a href="/rhn/schedule/CompletedSystems.do?aid=${current.id}"><c:out value="${current.actionName}" /></a>
- </rl:column>
+ <%@ include file="/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf" %>
- <rl:column sortable="true"
- bound="false"
- headerkey="actions.jsp.earliest"
- sortattr="earliestDate"
- defaultsort="desc">
- <c:out value="${current.earliest}" />
- </rl:column>
-
- <rl:column sortable="false"
- bound="false"
- headerkey="actions.jsp.succeeded"
- styleclass="thin-column">
- <c:if test="${current.completed != 0}">
- <a href="/rhn/schedule/CompletedSystems.do?aid=${current.id}">${current.completed}</a>
- </c:if>
- <c:if test="${current.completed == 0}">
- ${current.completed}
- </c:if>
- </rl:column>
-
- <rl:column sortable="false"
- bound="false"
- headerkey="actions.jsp.failed"
- styleclass="thin-column">
- <c:if test="${current.failed != 0}">
- <a href="/rhn/schedule/FailedSystems.do?aid=${current.id}">${current.failed}</a>
- </c:if>
- <c:if test="${current.failed == 0}">
- ${current.failed}
- </c:if>
- </rl:column>
-
- <rl:column sortable="false"
- bound="false"
- headerkey="actions.jsp.inprogress"
- styleclass="thin-column">
- <c:if test="${current.inProgress != 0}">
- <a href="/rhn/schedule/InProgressSystems.do?aid=${current.id}">${current.inProgress}</a>
- </c:if>
- <c:if test="${current.inProgress == 0}">
- ${current.inProgress}
- </c:if>
- </rl:column>
-
- <rl:column sortable="false"
- bound="false"
- headerkey="actions.jsp.total"
- styleclass="last-column thin-column">
- ${current.tally}
- </rl:column>
</rl:list>
<rhn:submitted/>
+ <div align="right">
+ <input type="submit"
+ name="dispatch"
+ value='<bean:message key="actions.jsp.deleteactions"/>'/>
+ </div>
</rl:listset>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 1d24faf..8cd1a2e 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -1860,9 +1860,12 @@
<action path="/schedule/ArchivedActions"
scope="request"
input="/WEB-INF/pages/schedule/archivedactions.jsp"
- type="com.redhat.rhn.frontend.action.schedule.ArchivedActionsSetupAction">
+ type="com.redhat.rhn.frontend.action.schedule.ArchivedActionsSetupAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <set-property property="postRequiredIfSubmitted" value="true" />
<forward name="default"
path="/WEB-INF/pages/schedule/archivedactions.jsp" />
+ <forward name="success" path="/schedule/ArchivedActions.do" redirect="true"/>
</action>
11 years, 8 months
backend/server
by StephenHerr
backend/server/handlers/xmlrpc/up2date.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0e51a4c7abcf9a0c4f6119753a43159b4e8054b5
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Aug 17 14:21:41 2012 -0400
849219 - don't explain the error about not subscribing proxy channels
diff --git a/backend/server/handlers/xmlrpc/up2date.py b/backend/server/handlers/xmlrpc/up2date.py
index 24429cf..ccfb42b 100644
--- a/backend/server/handlers/xmlrpc/up2date.py
+++ b/backend/server/handlers/xmlrpc/up2date.py
@@ -163,7 +163,7 @@ class Up2date(rhnHandler):
log_debug(1, self.server_id, channelNames)
for channelName in channelNames:
if NONSUBSCRIBABLE_CHANNELS.search(channelName):
- raise rhnFault(73)
+ raise rhnFault(73, explain=False)
else:
rhnChannel.subscribe_channel(self.server_id, channelName,
username, passwd)
11 years, 8 months