Changes to 'refs/tags/spacewalk-java-0.7.15-1'
by Tomas Lestach
Tag 'spacewalk-java-0.7.15-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2009-10-27 16:07 +0000
Tagging package [spacewalk-java] version [0.7.15-1] in directory [java/].
Changes since osad-5.9.22-1:
Michael Mraka (1):
removed redundant else; we call associate_package anyway
Tomas Lestach (2):
replacing HashSet with TreeSet
Automatic commit of package [spacewalk-java] release [0.7.15-1].
---
backend/satellite_tools/reposync.py | 4 +---
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 4 ++--
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 2 +-
java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java | 7 ++++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 4 ++--
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
7 files changed, 18 insertions(+), 13 deletions(-)
---
14 years, 6 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit b9fb49441ef7e64b7f79c882bbdf6650e4d50f21
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 27 17:07:05 2009 +0100
Automatic commit of package [spacewalk-java] release [0.7.15-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f6538f9..eacc426 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.13
+Version: 0.7.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,6 +280,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Oct 27 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.15-1
+- replacing HashSet with TreeSet (tlestach(a)redhat.com)
+- checkstyle errors removed (tlestach(a)redhat.com)
+- 525561 - fixing issue where ksdata without associated kickstart defaults
+ would try to be synced to cobbler and fail (jsherril(a)redhat.com)
+
* Mon Oct 26 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.13-1
- 527724 - fix for kickstart upgrade issue (tlestach(a)redhat.com)
- 449167 - it looks better when architecture column is not thin column
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 8fa8849..e4d3dbc 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.13-1 java/
+0.7.15-1 java/
14 years, 6 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 4 ++--
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 2 +-
java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java | 7 ++++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 4 ++--
4 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit df571b46c37182785468f858545da0936fcee225
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 27 16:56:49 2009 +0100
replacing HashSet with TreeSet
since java.util.HashSet cannot be cast to java.util.SortedSet
+ one parameter name change (bug introduced by checkstyle error removal)
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 6bb4beb..d15c925 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -104,7 +104,7 @@ public class KickstartData {
cryptoKeys = new HashSet();
defaultRegTokens = new HashSet();
preserveFileLists = new HashSet();
- ksPackages = new HashSet<KickstartPackage>();
+ ksPackages = new TreeSet<KickstartPackage>();
commands = new HashSet<KickstartCommand>();
ips = new HashSet();
scripts = new HashSet<KickstartScript>();
@@ -1225,7 +1225,7 @@ public class KickstartData {
}
cloned.setOrg(this.getOrg());
if (this.getKsPackages() != null) {
- cloned.setKsPackages(new HashSet(this.getKsPackages()));
+ cloned.setKsPackages(new TreeSet(this.getKsPackages()));
}
if (this.getPreserveFileLists() != null) {
cloned.setPreserveFileLists(new HashSet(this.getPreserveFileLists()));
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
index d6ae523..f9552b7 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
@@ -60,7 +60,7 @@ public class KickstartPackage
* @param positionIn The position to set.
*/
public void setPosition(Long positionIn) {
- this.position = position;
+ this.position = positionIn;
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java b/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
index 046bb14..66bdc30 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
@@ -46,6 +46,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -209,7 +210,7 @@ public class KickstartBuilder {
"%packages tag.");
}
- Set<KickstartPackage> ksPackagesSet = new HashSet<KickstartPackage>();
+ Set<KickstartPackage> ksPackagesSet = new TreeSet<KickstartPackage>();
for (Iterator<String> it = lines.iterator(); it.hasNext();) {
String currentLine = (String)it.next();
@@ -350,7 +351,7 @@ public class KickstartBuilder {
setupBasicInfo(label, ksdata, tree, virtualizationType);
if (ksdata.getKsPackages() == null) {
- ksdata.setKsPackages(new HashSet<KickstartPackage>());
+ ksdata.setKsPackages(new TreeSet<KickstartPackage>());
}
buildCommands(ksdata, parser.getOptionLines(), tree, kickstartHost);
@@ -531,7 +532,7 @@ public class KickstartBuilder {
cmd.processSkipKey(ksdata);
cmd.processRepos(ksdata);
if (ksdata.getKsPackages() == null) {
- ksdata.setKsPackages(new HashSet<KickstartPackage>());
+ ksdata.setKsPackages(new TreeSet<KickstartPackage>());
}
PackageName pn = cmd.findPackageName("@ Base");
ksdata.addKsPackage(new KickstartPackage(ksdata, pn));
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index 4da20a5..f5349b9 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -824,11 +824,11 @@ public class ProfileHandler extends BaseHandler {
// Set operations to determine deltas
Set<KickstartPackage> onlyInProfile1 =
- new HashSet<KickstartPackage>(profile1.getKsPackages());
+ new TreeSet<KickstartPackage>(profile1.getKsPackages());
onlyInProfile1.removeAll(profile2.getKsPackages());
Set<KickstartPackage> onlyInProfile2 =
- new HashSet<KickstartPackage>(profile2.getKsPackages());
+ new TreeSet<KickstartPackage>(profile2.getKsPackages());
onlyInProfile2.removeAll(profile1.getKsPackages());
// Convert the remaining into strings for return
14 years, 6 months
Branch 'sha256-support3' - 24 commits - backend/common backend/po backend/satellite_tools backend/server backend/spacewalk-backend.spec client/tools java/code java/spacewalk-java.spec rel-eng/packages web/conf web/spacewalk-web.spec
by Michael Mraka
backend/common/rhnException.py | 2
backend/po/server.pot | 2
backend/satellite_tools/reposync.py | 5
backend/satellite_tools/spacewalk-report.sgml | 23 +
backend/server/importlib/blacklistImport.py | 3
backend/server/importlib/packageImport.py | 19 -
backend/spacewalk-backend.spec | 5
client/tools/osad/osad.spec | 5
client/tools/osad/src/jabber_lib.py | 3
client/tools/rhncfg/config_common/file_utils.py | 16
client/tools/rhncfg/rhncfg.spec | 5
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 3
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml | 7
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 55 +--
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 31 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.hbm.xml | 32 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 176 ++++++++++
java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java | 18 -
java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java | 6
java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java | 2
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 19 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java | 39 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 22 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java | 17
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java | 20 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 25 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 5
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 6
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java | 11
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java | 7
java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 2
java/spacewalk-java.spec | 7
rel-eng/packages/osad | 2
rel-eng/packages/rhncfg | 2
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-web | 2
web/conf/rhn_web.conf | 4
web/spacewalk-web.spec | 7
40 files changed, 471 insertions(+), 150 deletions(-)
New commits:
commit a018a72a68b4bdafeadba3f02b3f5767ac6f9729
Merge: 31235dc... 5e04bd6...
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Oct 27 16:38:30 2009 +0100
Merge branch 'master' into sha256-support3
commit 31235dc0a3ab1e46079e3f5f569fd1a3e9325906
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Oct 27 16:06:46 2009 +0100
fixed satellite-sync (reverted checksum changes in blacklistImport)
Traceback (most recent call last):
File "/usr/share/rhn/satellite_tools/xmlSource.py", line 132, in process
self.__parser.parse(self.__stream)
File "/usr/lib64/python2.4/site-packages/_xmlplus/sax/expatreader.py", line 109, in parse
xmlreader.IncrementalParser.parse(self, source)
File "/usr/lib64/python2.4/site-packages/_xmlplus/sax/xmlreader.py", line 123, in parse
self.feed(buffer)
File "/usr/lib64/python2.4/site-packages/_xmlplus/sax/expatreader.py", line 216, in feed
self._parser.Parse(data, isFinal)
File "/usr/lib64/python2.4/site-packages/_xmlplus/sax/expatreader.py", line 314, in
+end_element
self._cont_handler.endElement(name)
File "/usr/share/rhn/satellite_tools/xmlSource.py", line 225, in endElement
self.__container.endElement(element)
File "/usr/share/rhn/satellite_tools/xmlSource.py", line 800, in endElement
self.endContainerCallback()
File "/usr/share/rhn/satellite_tools/diskImportLib.py", line 283, in endContainerCallback
importer.run()
File "/usr/share/rhn/server/importlib/importLib.py", line 627, in run
self.fix()
File "/usr/share/rhn/server/importlib/blacklistImport.py", line 49, in fix
entry['checksum_id'] = self.checksums[entry['checksum']]
File "/usr/lib64/python2.4/UserDict.py", line 17, in __getitem__
def __getitem__(self, key): return self.data[key]
KeyError: 'checksum'
diff --git a/backend/server/importlib/blacklistImport.py b/backend/server/importlib/blacklistImport.py
index 9b8b74a..5eda6b3 100644
--- a/backend/server/importlib/blacklistImport.py
+++ b/backend/server/importlib/blacklistImport.py
@@ -24,7 +24,6 @@ class BlacklistObsoletesImport(Import):
Import.__init__(self, batch, backend)
self.names = {}
self.evrs = {}
- self.checksums = {}
self.package_arches = {}
def preprocess(self):
@@ -41,12 +40,10 @@ class BlacklistObsoletesImport(Import):
def fix(self):
self.backend.lookupPackageNames(self.names)
self.backend.lookupEVRs(self.evrs)
- self.backend.lookupChecksums(self.checksums)
self.backend.lookupPackageArches(self.package_arches)
for entry in self.batch:
entry['name_id'] = self.names[entry['name']]
entry['evr_id'] = self.evrs[entry['evr']]
- entry['checksum_id'] = self.checksums[entry['checksum']]
entry['package_arch_id'] = self.package_arches[entry['package-arch']]
entry['ignore_name_id'] = self.names[entry['ignored-name']]
commit d04ef1d1e9f9e53bb43e4549e8824b649c6369d5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Oct 27 14:45:27 2009 +0100
added checksum support to spacewalk-repo-sync
Traceback (most recent call last):
File "/usr/share/rhn/satellite_tools/reposync.py", line 146, in import_packages
self.associate_package(pack, md5)
File "/usr/share/rhn/satellite_tools/reposync.py", line 193, in associate_package
self._importer_run(package, caller, backend)
File "/usr/share/rhn/satellite_tools/reposync.py", line 201, in _importer_run
importer.run()
File "/usr/share/rhn/server/importlib/importLib.py", line 628, in run
self.submit()
File "/usr/share/rhn/server/importlib/packageImport.py", line 115, in submit
self.backend.lookupPackages(self.batch)
File "/usr/share/rhn/server/importlib/backend.py", line 535, in lookupPackages
self.__lookupObjectCollection(packages, 'rhnPackage', ignore_missing)
File "/usr/share/rhn/server/importlib/backend.py", line 1774, in __lookupObjectCollection
h = lookup.query(object)
File "/usr/share/rhn/server/importlib/backendLib.py", line 221, in query
key, values = self._selectQueryKey(values)
File "/usr/share/rhn/server/importlib/backendLib.py", line 202, in _selectQueryKey
hash[col] = value[col]
File "/usr/lib64/python2.4/UserDict.py", line 17, in __getitem__
def __getitem__(self, key): return self.data[key]
KeyError: 'checksum_id'
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index b1b57e6..5b90b03 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -183,6 +183,7 @@ class RepoSync:
package['epoch'] = pack.epoch
package['arch'] = pack.arch
package['md5sum'] = md5sum
+ package['checksum'] = ('md5', md5sum)
package['channels'] = [{'label':self.channel_label,
'id':self.channel['id']}]
package['org_id'] = self.channel['org_id']
commit 71ed3da579a627266c9e19dddfe19fedca1e81c3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Oct 27 14:34:29 2009 +0100
moved checksum code from PackageImport to ChannelPackageSubscription
this fixed broken spacewalk-repo-sync after rhnChecksum change
Traceback (most recent call last):
File "/usr/share/rhn/satellite_tools/reposync.py", line 146, in import_packages
self.associate_package(pack, md5)
File "/usr/share/rhn/satellite_tools/reposync.py", line 193, in associate_package
self._importer_run(package, caller, backend)
File "/usr/share/rhn/satellite_tools/reposync.py", line 201, in _importer_run
importer.run()
File "/usr/share/rhn/server/importlib/importLib.py", line 628, in run
self.submit()
File "/usr/share/rhn/server/importlib/packageImport.py", line 115, in submit
self.backend.lookupPackages(self.batch)
File "/usr/share/rhn/server/importlib/backend.py", line 535, in lookupPackages
self.__lookupObjectCollection(packages, 'rhnPackage', ignore_missing)
File "/usr/share/rhn/server/importlib/backend.py", line 1774, in __lookupObjectCollection
h = lookup.query(object)
File "/usr/share/rhn/server/importlib/backendLib.py", line 221, in query
key, values = self._selectQueryKey(values)
File "/usr/share/rhn/server/importlib/backendLib.py", line 202, in _selectQueryKey
hash[col] = value[col]
File "/usr/lib64/python2.4/UserDict.py", line 17, in __getitem__
def __getitem__(self, key): return self.data[key]
KeyError: 'checksum_id'
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index 189e88b..8c4932a 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -71,6 +71,7 @@ class ChannelPackageSubscription(GenericPackageImport):
if package.ignored:
continue
self._postprocessPackageNEVRA(package)
+ package['checksum_id'] = self.checksums[package['checksum']]
if not CFG.ENABLE_NVREA:
# nvrea disabled, skip md5sum
nevrao = (
@@ -177,6 +178,12 @@ class ChannelPackageSubscription(GenericPackageImport):
self.channels[channelName] = None
# Replace the channel list with the uniquified list
package.channels = channels
+
+ # FIXME: needs to be fixed for sha256
+ checksum = ('md5',package['md5sum'])
+ package['checksum'] = checksum
+ if not self.checksums.has_key(checksum):
+ self.checksums[checksum] = None
# Copies the channels from one package to the other
def __copyChannels(self, sourcePackage, destPackage):
@@ -234,12 +241,6 @@ class PackageImport(ChannelPackageSubscription):
# XXX
package['copyright'] = package['license']
- # FIXME: needs to be fixed for sha256
- checksum = ('md5',package['md5sum'])
- package['checksum'] = checksum
- if not self.checksums.has_key(checksum):
- self.checksums[checksum] = None
-
# Creates all the data structures needed to insert capabilities
for tag in ('provides', 'requires', 'conflicts', 'obsoletes'):
depList = package[tag]
commit 5e04bd6ad1769e3df33a67e171a9b0605ccdd5e5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 26 13:24:05 2009 +0100
removed redundant else; we call associate_package anyway
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index b1b57e6..298f740 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -143,9 +143,7 @@ class RepoSync:
self.channel['org_id'], md5)
if pid is None:
self.upload_package(pack, path)
- self.associate_package(pack, md5)
- else:
- self.associate_package(pack, md5) #package is already on the satellite, lets just associate
+ self.associate_package(pack, md5)
if self.url.find("file://") < 0:
os.remove(path)
commit c8e0dc69a0d77cf95524e896f19ce9fea6832a09
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Oct 27 11:51:57 2009 +0100
Automatic commit of package [osad] release [5.9.22-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index e7bc369..6b465af 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -9,7 +9,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.21
+Version: 5.9.22
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -236,6 +236,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {}
# $Id$
%changelog
+* Tue Oct 27 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.22-1
+- Make debugging osa* network/jabber issues easier (joshua.roys(a)gtri.gatech.edu)
+
* Tue Aug 04 2009 Jan Pazdziora 5.9.21-1
- 514320 - open the pid file with append
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index bb7e89c..7e1b7bd 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.9.21-1 client/tools/osad/
+5.9.22-1 client/tools/osad/
commit 44719baf2100216b716fbd2ac457debfe216b157
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Oct 27 11:39:25 2009 +0100
Automatic commit of package [rhncfg] release [5.9.11-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 9d8b5a8..07cbb11 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.9.10
+Version: 5.9.11
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue Oct 27 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.11-1
+- Diff SELinux contexts (joshua.roys(a)gtri.gatech.edu)
+
* Wed Sep 02 2009 Michael Mraka <michael.mraka(a)redhat.com> 5.9.10-1
- Add symlink capability to config management (joshua.roys(a)gtri.gatech.edu)
- 519195 - fix typos in rhncfg-manager manual page
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 94ad1ff..3eed1e7 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.10-1 client/tools/rhncfg/
+5.9.11-1 client/tools/rhncfg/
commit 08b218ae7a49870c9e4290d257fc9bec5b6974bb
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Mon Oct 26 11:35:12 2009 -0400
Make debugging osa* network/jabber issues easier
diff --git a/client/tools/osad/src/jabber_lib.py b/client/tools/osad/src/jabber_lib.py
index 5c615ae..344a91b 100644
--- a/client/tools/osad/src/jabber_lib.py
+++ b/client/tools/osad/src/jabber_lib.py
@@ -259,12 +259,15 @@ class Runner:
sys.exit(1)
except socket.error, e:
self.print_message(js, "socket error")
+ log_error(extract_traceback())
continue
except JabberError, e:
self.print_message(js, "JabberError")
+ log_error(extract_traceback())
continue
except SSLError, e:
self.print_message(js, "SSLError")
+ log_error(extract_traceback())
continue
else:
# Ran out of Jabber servers to try
commit 32d5d9a1471cfed0316371c491ed8648e8164ac2
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Fri Sep 25 07:25:09 2009 -0400
Diff SELinux contexts
diff --git a/client/tools/rhncfg/config_common/file_utils.py b/client/tools/rhncfg/config_common/file_utils.py
index c34c605..3e19550 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -18,6 +18,12 @@ import time
import tempfile
import base64
from config_common.rhn_log import log_debug
+try:
+ from selinux import lgetfilecon
+except:
+ # on rhel4 we do not support selinux
+ def lgetfilecon(path):
+ return [0, '']
from config_common import utils
@@ -81,7 +87,13 @@ class FileProcessor:
temp_file, temp_dirs = self.process(file_struct)
path = file_struct['path']
- result = None
+ sectx_result = ''
+ result = ''
+
+ cur_sectx = lgetfilecon(path)[1]
+ if file_struct.has_key('selinux_ctx'):
+ if cur_sectx != file_struct['selinux_ctx']:
+ sectx_result = "SELinux contexts differ! Current context: %s\n" % cur_sectx
if file_struct['filetype'] == 'symlink':
try:
@@ -101,7 +113,7 @@ class FileProcessor:
result = pipe.read()
os.unlink(temp_file)
- return result
+ return sectx_result + result
def _validate_struct(self, file_struct):
for k in self.file_struct_fields.keys():
commit b1a8ffa2d26b79e043faa7fe15b977a28dbc41ae
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 27 11:05:25 2009 +0100
checkstyle errors removed
no functionality changes
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index ca1cd8d..6bb4beb 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -21,7 +21,6 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.common.FileList;
import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
import com.redhat.rhn.domain.org.Org;
-import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.token.Token;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.kickstart.KickstartFormatter;
@@ -427,7 +426,7 @@ public class KickstartData {
/**
* Adds a KickstartPackage object to ksPackages.
- * @param p KickstartPackage to add
+ * @param kp KickstartPackage to add
*/
public void addKsPackage(KickstartPackage kp) {
@@ -437,7 +436,7 @@ public class KickstartData {
/**
* Removes a KickstartPackage object from ksPackages.
- * @param p KickstartPackage to remove
+ * @param kp KickstartPackage to remove
*/
public void removeKsPackage(KickstartPackage kp) {
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index 4e269fb..c07f688 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -1046,16 +1046,22 @@ public class KickstartFactory extends HibernateFactory {
return custom;
}
+ /**
+ * @param p KickstartPackage to add to DB
+ */
public static void savePackage(KickstartPackage p) {
singleton.saveObject(p);
}
+ /**
+ * @param p KickstartPackage to remove from DB
+ */
public static void removePackage(KickstartPackage p) {
singleton.removeObject(p);
}
/**
- * @param ksData KcikstartDate to lookup
+ * @param ksData KcikstartData to lookup
* @param packageName PackageName to lookup
* @return KickstartPackge list
*/
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
index c00bfd0..d6ae523 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2009 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -16,7 +16,6 @@ package com.redhat.rhn.domain.kickstart;
import java.util.Date;
import java.io.Serializable;
-import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import com.redhat.rhn.domain.rhnpackage.PackageName;
@@ -41,13 +40,13 @@ public class KickstartPackage
}
/**
- * @param ksdata
- * @param package_name_id
+ * @param ksDataIn identifies kickstart
+ * @param packageNameIn PackageName to be assciated
*/
- public KickstartPackage(KickstartData ksdata, PackageName package_name_id) {
+ public KickstartPackage(KickstartData ksDataIn, PackageName packageNameIn) {
super();
- this.ksData = ksdata;
- this.packageName = package_name_id;
+ this.ksData = ksDataIn;
+ this.packageName = packageNameIn;
}
/**
@@ -58,9 +57,9 @@ public class KickstartPackage
}
/**
- * @param position The position to set.
+ * @param positionIn The position to set.
*/
- public void setPosition(Long position) {
+ public void setPosition(Long positionIn) {
this.position = position;
}
@@ -72,10 +71,10 @@ public class KickstartPackage
}
/**
- * @param created The created to set.
+ * @param createdIn The created to set.
*/
- public void setCreated(Date created) {
- this.created = created;
+ public void setCreated(Date createdIn) {
+ this.created = createdIn;
}
/**
@@ -86,10 +85,10 @@ public class KickstartPackage
}
/**
- * @param modified The modified to set.
+ * @param modifiedIn The modified to set.
*/
- public void setModified(Date modified) {
- this.modified = modified;
+ public void setModified(Date modifiedIn) {
+ this.modified = modifiedIn;
}
/**
@@ -120,21 +119,25 @@ public class KickstartPackage
this.packageName = pn;
}
+ /**
+ * @param that KickstartPackage to be compared
+ * @return -1,0,1 for sort algo
+ */
public int compareTo(KickstartPackage that) {
- final int EQUAL = 0;
+ final int equal = 0;
if (this.equals(that)) {
- return EQUAL;
+ return equal;
}
int comparism = this.getKsData().getId().compareTo(that.getKsData().getId());
- if (EQUAL != comparism) {
+ if (equal != comparism) {
return comparism;
}
comparism = this.getPosition().compareTo(that.getPosition());
- if (EQUAL != comparism){
+ if (equal != comparism) {
return comparism;
}
return this.getPackageName().compareTo(that.getPackageName());
@@ -148,7 +151,7 @@ public class KickstartPackage
return false;
}
KickstartPackage that = (KickstartPackage) other;
- return this.hashCode()== other.hashCode();
+ return this.hashCode() == other.hashCode();
}
/**
@@ -162,6 +165,9 @@ public class KickstartPackage
.toHashCode();
}
+ /**
+ * {@inheritDoc}
+ */
public String toString() {
return "packageName: ".concat(this.getKsData().getId().toString())
.concat(", ").concat(this.getPosition().toString())
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
index ba27013..3b2ccf4 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
@@ -464,8 +464,8 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
k.setKernelParams(KERNEL_PARAMS);
- k.addKsPackage(new KickstartPackage(k,pn));
- k.addKsPackage(new KickstartPackage(k,pn2));
+ k.addKsPackage(new KickstartPackage(k, pn));
+ k.addKsPackage(new KickstartPackage(k, pn2));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
index 0f3c88e..2d3ec6f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
@@ -28,7 +28,6 @@ import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.StringTokenizer;
@@ -138,8 +137,10 @@ public class EditPackagesAction extends RhnAction {
// first clear the kickstart packages set
Set ksPackages = ksdata.getKsPackages();
for (Iterator iter = ksPackages.iterator(); iter.hasNext();) {
- KickstartFactory.removePackage((KickstartPackage)iter.next()); // remove from DB
- iter.remove(); // remove from collection
+ // remove from DB
+ KickstartFactory.removePackage((KickstartPackage)iter.next());
+ // remove from collection
+ iter.remove();
}
String newPackages = form.getString(PACKAGE_LIST);
@@ -152,11 +153,12 @@ public class EditPackagesAction extends RhnAction {
continue;
}
PackageName pn = PackageFactory.lookupOrCreatePackageByName(pkg);
- KickstartPackage ks_p = new KickstartPackage(ksdata,pn);
+ KickstartPackage kp = new KickstartPackage(ksdata, pn);
- if (KickstartFactory.lookupKsPackageByKsDataAndPackageName(ksdata, pn).isEmpty()) {
- ksdata.addKsPackage(ks_p); // save to collection
- KickstartFactory.savePackage(ks_p); // save to DB
+ if (KickstartFactory.lookupKsPackageByKsDataAndPackageName(
+ ksdata, pn).isEmpty()) {
+ ksdata.addKsPackage(kp); // save to collection
+ KickstartFactory.savePackage(kp); // save to DB
}
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index 61feda3..4da20a5 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -31,7 +31,6 @@ import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.KickstartScript;
import com.redhat.rhn.domain.kickstart.KickstartableTree;
import com.redhat.rhn.domain.org.Org;
-import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.token.ActivationKey;
import com.redhat.rhn.domain.user.User;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
index db1e611..0c2cc27 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
@@ -92,7 +92,7 @@ public class SoftwareHandler extends BaseHandler {
packages.clear();
for (String p : packageList) {
PackageName pn = PackageFactory.lookupOrCreatePackageByName(p);
- packages.add(new KickstartPackage(ksdata,pn));
+ packages.add(new KickstartPackage(ksdata, pn));
}
KickstartFactory.saveKickstartData(ksdata);
return 1;
@@ -123,9 +123,9 @@ public class SoftwareHandler extends BaseHandler {
Set<KickstartPackage> packages = ksdata.getKsPackages();
for (String p : packageList) {
PackageName pn = PackageFactory.lookupOrCreatePackageByName(p);
- KickstartPackage ks_p = new KickstartPackage(ksdata, pn);
- if (!packages.contains(ks_p)) {
- packages.add(ks_p);
+ KickstartPackage kp = new KickstartPackage(ksdata, pn);
+ if (!packages.contains(kp)) {
+ packages.add(kp);
}
}
KickstartFactory.saveKickstartData(ksdata);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
index ccf9536..a6ccff7 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
@@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.kickstart.profile.software.test;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
-import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.frontend.xmlrpc.kickstart.profile.software.SoftwareHandler;
import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
index 870ec17..64159bb 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
@@ -186,7 +186,8 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
public void testDownloadKickstart() throws Exception {
KickstartData ks1 = KickstartDataTest.createKickstartWithProfile(admin);
- ks1.addKsPackage(new KickstartPackage(ks1, PackageFactory.lookupOrCreatePackageByName("blahPackage")));
+ ks1.addKsPackage(new KickstartPackage(ks1,
+ PackageFactory.lookupOrCreatePackageByName("blahPackage")));
ActivationKey key = ActivationKeyTest.createTestActivationKey(admin);
ks1.addDefaultRegToken(key.getToken());
@@ -458,11 +459,11 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
Package package2 = PackageTest.createTestPackage(admin.getOrg());
Package package3 = PackageTest.createTestPackage(admin.getOrg());
- ks1.addKsPackage(new KickstartPackage(ks1,package1.getPackageName()));
- ks1.addKsPackage(new KickstartPackage(ks1,package2.getPackageName()));
+ ks1.addKsPackage(new KickstartPackage(ks1, package1.getPackageName()));
+ ks1.addKsPackage(new KickstartPackage(ks1, package2.getPackageName()));
- ks2.addKsPackage(new KickstartPackage(ks2,package1.getPackageName()));
- ks2.addKsPackage(new KickstartPackage(ks2,package3.getPackageName()));
+ ks2.addKsPackage(new KickstartPackage(ks2, package1.getPackageName()));
+ ks2.addKsPackage(new KickstartPackage(ks2, package3.getPackageName()));
KickstartFactory.saveKickstartData(ks1);
KickstartFactory.saveKickstartData(ks2);
@@ -498,7 +499,7 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
Package package1 = PackageTest.createTestPackage(admin.getOrg());
- ks1.addKsPackage(new KickstartPackage(ks1,package1.getPackageName()));
+ ks1.addKsPackage(new KickstartPackage(ks1, package1.getPackageName()));
KickstartFactory.saveKickstartData(ks1);
commit 1ae5ebbdc7f1cf7adb5202dbf3151009769f1278
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Oct 26 16:45:29 2009 -0400
525561 - fixing issue where ksdata without associated kickstart defaults would try to be synced to cobbler and fail
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java
index 6a7d25b..457836f 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.manager.kickstart.cobbler;
import com.redhat.rhn.domain.kickstart.KickstartData;
+import com.redhat.rhn.domain.kickstart.KickstartDefaults;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.KickstartSession;
import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType;
@@ -68,7 +69,9 @@ public abstract class CobblerProfileCommand extends CobblerCommand {
}
protected void updateCobblerFields(Profile profile) {
- profile.setDistro(getDistroForKickstart());
+ if (getDistroForKickstart() != null) {
+ profile.setDistro(getDistroForKickstart());
+ }
if (kernelOptions != null) {
profile.setKernelOptions(kernelOptions);
}
@@ -130,7 +133,11 @@ public abstract class CobblerProfileCommand extends CobblerCommand {
* @return the distro object
*/
public Distro getDistroForKickstart() {
- return getCobblerDistroForVirtType(ksData.getTree(),
+ KickstartDefaults def = ksData.getKickstartDefaults();
+ if (def == null) {
+ return null;
+ }
+ return getCobblerDistroForVirtType(def.getKstree(),
ksData.getKickstartDefaults().getVirtualizationType(), user);
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
index 7c83dc8..7f36f76 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
@@ -72,6 +72,13 @@ public class CobblerProfileSyncCommand extends CobblerCommand {
List<KickstartData> profiles = KickstartFactory.listAllKickstartData();
Map<String, Map> profileNames = getModifiedProfileNames();
for (KickstartData profile : profiles) {
+ /**
+ * workaround for bad data left in the DB (bz 525561)
+ */
+ if (profile.getKickstartDefaults() == null) {
+ continue;
+ }
+
if (!profileNames.containsKey(profile.getCobblerId())) {
if (profile.getKickstartDefaults().getKstree().getCobblerId() == null) {
log.warn("Kickstart profile " + profile.getLabel() +
commit 367d5ad03ff0ce48536ad9ff0259bcd02ffae263
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 26 16:13:33 2009 +0100
Automatic commit of package [spacewalk-java] release [0.7.13-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 91560f3..f6538f9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.12
+Version: 0.7.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,7 +280,7 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
-* Mon Oct 26 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.12-1
+* Mon Oct 26 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.13-1
- 527724 - fix for kickstart upgrade issue (tlestach(a)redhat.com)
- 449167 - it looks better when architecture column is not thin column
(msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 9f0c3b3..8fa8849 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.12-1 java/
+0.7.13-1 java/
commit e8adec210a56c2ece7e375ae441fa44efed50404
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 26 15:34:19 2009 +0100
Automatic commit of package [spacewalk-java] release [0.7.12-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6f2e28b..91560f3 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.11
+Version: 0.7.12
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,7 +280,7 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
-* Mon Oct 26 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.11-1
+* Mon Oct 26 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.12-1
- 527724 - fix for kickstart upgrade issue (tlestach(a)redhat.com)
- 449167 - it looks better when architecture column is not thin column
(msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5045330..9f0c3b3 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.11-1 java/
+0.7.12-1 java/
commit 01a2f96380bf8f941f9b4683c7b7a0969ddbcdac
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 26 15:30:53 2009 +0100
removing @Override from CobblerSnippet as do not have parrents
brew build fails with:
[javac] /builddir/build/BUILD/spacewalk-java-git-085e811ec277e3aac992fe55d9bf5760b0195be8/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java:323: method does not override a method from its superclass
[javac] @Override
[javac] ^
[javac] Note: * uses or overrides a deprecated API.
[javac] Note: Recompile with -Xlint:deprecation for details.
[javac] Note: Some input files use unchecked or unsafe operations.
[javac] Note: Recompile with -Xlint:unchecked for details.
[javac] 1 error
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java b/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
index aa718ac..47ef54a 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
@@ -318,7 +318,6 @@ public class CobblerSnippet implements Comparable {
/**
* {@inheritDoc}
*/
- @Override
public boolean equals(Object o) {
if (this == o) {
return true;
@@ -334,7 +333,6 @@ public class CobblerSnippet implements Comparable {
/**
* {@inheritDoc}
*/
- @Override
public int hashCode() {
HashCodeBuilder b = new HashCodeBuilder();
b.append(getPath());
commit 0883c247a11b8b6470605e010078899cf3b0abac
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 26 14:41:28 2009 +0100
Automatic commit of package [spacewalk-java] release [0.7.11-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8d93d5d..6f2e28b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.10
+Version: 0.7.11
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,6 +280,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Oct 26 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.11-1
+- 527724 - fix for kickstart upgrade issue (tlestach(a)redhat.com)
+- 449167 - it looks better when architecture column is not thin column
+ (msuchy(a)redhat.com)
+
* Fri Oct 23 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.10-1
- 449167 - show rpm install date in webui
- 144325 - recommiting this without the unintended sql commit <jsherril(a)redhat.com>
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 827cab6..5045330 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.10-1 java/
+0.7.11-1 java/
commit 73f80e76431459f5992cc47049a640e6ce563776
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 26 15:39:00 2009 +0100
Automatic commit of package [spacewalk-web] release [0.7.5-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index b815024..6ed3ce6 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.7.4-1 web/
+0.7.5-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index b436c25..b1bb24a 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.4
+Version: 0.7.5
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -317,6 +317,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Oct 26 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.5-1
+- bump up spacewalk version to 0.7
+- 449167 - add api call for rpm install date
+- Make spacewalk use the editarea RPM and remove supplied editarea files <colin.coe(a)gmail.com>
+
* Thu Sep 17 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.4-1
- 476851 - removal of tables: rhn_db_environment, rhn_environment
- 520441 - don't apply ExtUtils::MY->fixin(shift) to perl executables
commit e0e9c5e7a1d068904d978ada65577fff67df69d9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 26 15:26:10 2009 +0100
bump up spacewalk version to 0.7
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index b089c14..1bb5e55 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -233,7 +233,7 @@ web.config_delim_start = {|
web.config_delim_end = |}
# the version of this RHN install as a whole
-web.version = 0.6
+web.version = 0.7
# the version of API
web.apiversion = 10.10
commit 0de2bb6cf2dac2a5a2cde2afcc3715dcb3560fb9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 26 15:25:14 2009 +0100
449167 - add api call for rpm install date
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 3c59835..0bcd46b 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1239,7 +1239,8 @@ SELECT PN.name,
PE.version,
PE.release,
NVL(PE.epoch, ' ') as epoch,
- PA.name as arch
+ PA.name as arch,
+ SP.installtime
FROM rhnPackageName PN, rhnPackageEVR PE, rhnServerPackage SP, rhnPackageArch PA
WHERE SP.server_id = :sid
AND PN.id = SP.name_id
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index bdddc4c..d8b2ca6 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1065,7 +1065,9 @@ public class SystemHandler extends BaseHandler {
}
/**
- * List the installed packages for a given system
+ * List the installed packages for a given system.
+ * @xmlrpc.doc List the installed packages for a given system. The attribute
+ * installtime is returned since API version 10.10.
* @param sessionKey The sessionKey containing the logged in user
* @param sid The id of the system in question
* @return Returns an array of maps representing the packages installed on a system
@@ -1083,6 +1085,7 @@ public class SystemHandler extends BaseHandler {
* #prop("string", "release")
* #prop("string", "epoch")
* #prop("string", "arch")
+ * #prop("string", "installtime")
* #struct_end()
* #array_end()
*/
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index e612b9c..b089c14 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -236,7 +236,7 @@ web.config_delim_end = |}
web.version = 0.6
# the version of API
-web.apiversion = 10.9
+web.apiversion = 10.10
# maximum size for a config file
web.maximum_config_file_size = 131072
commit ad6e557d1de575325d1b495fde38fc273c41bef6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 26 13:31:42 2009 +0100
fixed indentation
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index c63c0a7..189e88b 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -373,9 +373,9 @@ class PackageImport(ChannelPackageSubscription):
for entry in package[tag]:
nv = entry['capability']
entry['capability_id'] = self.capabilities[nv]
- fileList = package['files']
- for f in fileList:
- f['checksum_id'] = self.checksums[f['checksum']]
+ fileList = package['files']
+ for f in fileList:
+ f['checksum_id'] = self.checksums[f['checksum']]
def __postprocessSolarisPackage(self, package):
# set solaris patch packages for a solaris patch
commit 6df3775d478837bedb5855c2963e5e5f9908efcf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 14 14:38:10 2009 +0200
fixed error message #501
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index a6a54fc..a91bd4f 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -223,7 +223,7 @@ maximum membership exceeded"),
# 500-599: Package Uploader errors
500: _("Missing HTTP header information"),
- 501: _("The package's md5sum signature does not match the header one"),
+ 501: _("The package's checksum signature does not match the header one"),
502: _("Header information does not match package metainformation"),
503: _("Package with a different signature already uploaded"),
504: _("Not an RPM package"),
diff --git a/backend/po/server.pot b/backend/po/server.pot
index b8be17e..33f28ff 100644
--- a/backend/po/server.pot
+++ b/backend/po/server.pot
@@ -938,7 +938,7 @@ msgid "Missing HTTP header information"
msgstr ""
#: ../common/rhnException.py:196
-msgid "The package's md5sum signature does not match the header one"
+msgid "The package's checksum signature does not match the header one"
msgstr ""
#: ../common/rhnException.py:197
commit 01141f852a53f3b3f4e2d6e55ccd91478cb12209
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 26 12:54:51 2009 +0100
527724 - fix for kickstart upgrade issue
list index according to that a list gets sorted wasn't unique after upgrade, what caused a trouble to hibernate, so the list was replaced by a ordered set
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml
index d21fb86..c3ee13a 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml
@@ -34,11 +34,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="nonChrootPost" column="nonchrootpost" not-null="false" type="yes_no" />
<property name="verboseUp2date" column="verboseup2date" not-null="false" type="yes_no" />
<property name="cobblerId" column="cobbler_id" type="string" length="64" />
- <list name="packageNames" table="rhnKickstartPackage" lazy="true">
+ <set name="ksPackages" lazy="true" sort="natural" inverse="true">
<key column="kickstart_id"/>
- <index column="position"/>
- <many-to-many column="package_name_id" class="com.redhat.rhn.domain.rhnpackage.PackageName" />
- </list>
+ <one-to-many class="com.redhat.rhn.domain.kickstart.KickstartPackage" />
+ </set>
<set name="cryptoKeys" table="rhnCryptoKeyKickstart" lazy="true">
<key column="ksdata_id"/>
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index e8c17ec..ca1cd8d 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -21,7 +21,7 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.common.FileList;
import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
import com.redhat.rhn.domain.org.Org;
-import com.redhat.rhn.domain.rhnpackage.PackageName;
+import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.token.Token;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.kickstart.KickstartFormatter;
@@ -33,7 +33,6 @@ import org.apache.log4j.Logger;
import org.cobbler.CobblerConnection;
import org.cobbler.Profile;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -75,7 +74,7 @@ public class KickstartData {
private Set childChannels;
private Set defaultRegTokens;
private Set preserveFileLists;
- private List<PackageName> packageNames;
+ private Set<KickstartPackage> ksPackages;
private Collection<KickstartCommand> commands = new HashSet<KickstartCommand>();
private Set ips; // rhnKickstartIpRange
private Set<KickstartScript> scripts; // rhnKickstartScript
@@ -106,7 +105,7 @@ public class KickstartData {
cryptoKeys = new HashSet();
defaultRegTokens = new HashSet();
preserveFileLists = new HashSet();
- packageNames = new ArrayList<PackageName>();
+ ksPackages = new HashSet<KickstartPackage>();
commands = new HashSet<KickstartCommand>();
ips = new HashSet();
scripts = new HashSet<KickstartScript>();
@@ -377,7 +376,7 @@ public class KickstartData {
/**
* Getter for defaultRegTokens
- * @return Returns the pacakageLists.
+ * @return Returns the packageLists.
*/
public Set<Token> getDefaultRegTokens() {
return defaultRegTokens;
@@ -385,7 +384,7 @@ public class KickstartData {
/**
* Setter for defaultRegTokens
- * @param p The pacakgeLists to set.
+ * @param p The packageLists to set.
*/
public void setDefaultRegTokens(Set p) {
this.defaultRegTokens = p;
@@ -427,27 +426,38 @@ public class KickstartData {
}
/**
- * Adds a PackageName object to packageNames.
- * @param p PackageName to add
+ * Adds a KickstartPackage object to ksPackages.
+ * @param p KickstartPackage to add
*/
- public void addPackageName(PackageName p) {
- packageNames.add(p);
+
+ public void addKsPackage(KickstartPackage kp) {
+ kp.setPosition((long)ksPackages.size());
+ this.ksPackages.add(kp);
+ }
+
+ /**
+ * Removes a KickstartPackage object from ksPackages.
+ * @param p KickstartPackage to remove
+ */
+
+ public void removeKsPackage(KickstartPackage kp) {
+ this.ksPackages.remove(kp);
}
/**
- * Getter for packageNames
- * @return Returns the pacakageNames.
+ * Getter for ksPackages
+ * @return Returns the ksPackages.
*/
- public List<PackageName> getPackageNames() {
- return packageNames;
+ public Set<KickstartPackage> getKsPackages() {
+ return ksPackages;
}
/**
- * Setter for packageNames
- * @param p The pacakgeLists to set.
+ * Setter for ksPackages
+ * @param p The KickstartPackage set to set.
*/
- public void setPackageNames(List<PackageName> p) {
- this.packageNames = p;
+ public void setKsPackages(Set<KickstartPackage> p) {
+ this.ksPackages = p;
}
/**
@@ -1215,8 +1225,8 @@ public class KickstartData {
cloned.setKickstartDefaults(this.getKickstartDefaults().deepCopy(cloned));
}
cloned.setOrg(this.getOrg());
- if (this.getPackageNames() != null) {
- cloned.setPackageNames(new ArrayList(this.getPackageNames()));
+ if (this.getKsPackages() != null) {
+ cloned.setKsPackages(new HashSet(this.getKsPackages()));
}
if (this.getPreserveFileLists() != null) {
cloned.setPreserveFileLists(new HashSet(this.getPreserveFileLists()));
@@ -1265,7 +1275,6 @@ public class KickstartData {
else {
return false;
}
-
}
/**
@@ -1284,7 +1293,6 @@ public class KickstartData {
return ConfigDefaults.get().getKickstartPackageName();
}
-
/**
* @return Returns if the post scripts should be logged.
@@ -1306,7 +1314,6 @@ public class KickstartData {
public Boolean getKsCfg() {
return ksCfg;
}
-
/**
* @param postLogIn The postLog to set.
@@ -1328,7 +1335,6 @@ public class KickstartData {
public void setKsCfg(Boolean ksCfgIn) {
this.ksCfg = ksCfgIn;
}
-
/**
* Returns the SE Linux mode associated to this kickstart profile
@@ -1370,8 +1376,6 @@ public class KickstartData {
return getKickstartDefaults() != null &&
getKickstartDefaults().getRemoteCommandFlag();
}
-
-
/**
* @return the cobblerName
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index fc8255e..4e269fb 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.common.util.FileUtils;
import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
import com.redhat.rhn.domain.kickstart.crypto.CryptoKeyType;
import com.redhat.rhn.domain.org.Org;
+import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.manager.kickstart.KickstartFormatter;
import com.redhat.rhn.manager.kickstart.KickstartUrlHelper;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
@@ -123,7 +124,8 @@ public class KickstartFactory extends HibernateFactory {
.setString("id", cobblerId)
.setLong("org_id", orgIn.getId())
.uniqueResult();
- }
+ }
+
/**
* Lookup a KickstartData based on a label and orgId
* @param label to lookup
@@ -1044,4 +1046,25 @@ public class KickstartFactory extends HibernateFactory {
return custom;
}
+ public static void savePackage(KickstartPackage p) {
+ singleton.saveObject(p);
+ }
+
+ public static void removePackage(KickstartPackage p) {
+ singleton.removeObject(p);
+ }
+
+ /**
+ * @param ksData KcikstartDate to lookup
+ * @param packageName PackageName to lookup
+ * @return KickstartPackge list
+ */
+ public static List<KickstartPackage> lookupKsPackageByKsDataAndPackageName(
+ KickstartData ksData, PackageName packageName) {
+ return HibernateFactory.getSession()
+ .getNamedQuery("KickstartPackage.findByKickstartDataAndPackageName")
+ .setLong("ks_data", ksData.getId())
+ .setLong("package_name", packageName.getId())
+ .list();
+ }
}
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.hbm.xml b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.hbm.xml
new file mode 100644
index 0000000..87c5cac
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.hbm.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping
+PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+ <class name="com.redhat.rhn.domain.kickstart.KickstartPackage"
+ table="rhnKickstartPackage">
+
+ <composite-id>
+ <key-many-to-one name="ksData"
+ class="com.redhat.rhn.domain.kickstart.KickstartData"
+ access="field"
+ column="kickstart_id"
+ />
+ <key-many-to-one name="packageName"
+ class="com.redhat.rhn.domain.rhnpackage.PackageName"
+ column="package_name_id"
+ />
+ </composite-id>
+
+ <property name="position" column="position" not-null="true"/>
+ <property name="created" column="created" not-null="true" type="timestamp" insert="false" update="false"/>
+ <property name="modified" column="modified" not-null="true" type="timestamp" insert="false" update="false"/>
+
+ </class>
+
+
+ <query name="KickstartPackage.findByKickstartDataAndPackageName">
+ <![CDATA[from com.redhat.rhn.domain.kickstart.KickstartPackage as kp where kp.ksData = :ks_data and kp.packageName = :package_name]]>
+ </query>
+
+</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
new file mode 100644
index 0000000..c00bfd0
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
@@ -0,0 +1,170 @@
+/**
+ * Copyright (c) 2008 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.domain.kickstart;
+
+import java.util.Date;
+import java.io.Serializable;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import com.redhat.rhn.domain.rhnpackage.PackageName;
+
+/**
+ * KickstartPackage
+ * @version $Rev$
+ */
+public class KickstartPackage
+ implements Serializable, Comparable<KickstartPackage> {
+
+ private Long position;
+ private Date created;
+ private Date modified;
+ private KickstartData ksData;
+ private PackageName packageName;
+
+ /**
+ *
+ */
+ public KickstartPackage() {
+ super();
+ }
+
+ /**
+ * @param ksdata
+ * @param package_name_id
+ */
+ public KickstartPackage(KickstartData ksdata, PackageName package_name_id) {
+ super();
+ this.ksData = ksdata;
+ this.packageName = package_name_id;
+ }
+
+ /**
+ * @return Returns the position.
+ */
+ public Long getPosition() {
+ return position;
+ }
+
+ /**
+ * @param position The position to set.
+ */
+ public void setPosition(Long position) {
+ this.position = position;
+ }
+
+ /**
+ * @return Returns the created.
+ */
+ public Date getCreated() {
+ return created;
+ }
+
+ /**
+ * @param created The created to set.
+ */
+ public void setCreated(Date created) {
+ this.created = created;
+ }
+
+ /**
+ * @return Returns the modified.
+ */
+ public Date getModified() {
+ return modified;
+ }
+
+ /**
+ * @param modified The modified to set.
+ */
+ public void setModified(Date modified) {
+ this.modified = modified;
+ }
+
+ /**
+ * @return Returns the ksdata.
+ */
+ public KickstartData getKsData() {
+ return ksData;
+ }
+
+ /**
+ * @param ksdata The ksdata to set.
+ */
+ public void setKsData(KickstartData ksdata) {
+ this.ksData = ksdata;
+ }
+
+ /**
+ * @return Returns the packageName.
+ */
+ public PackageName getPackageName() {
+ return packageName;
+ }
+
+ /**
+ * @param pn The packageName to set.
+ */
+ public void setPackageName(PackageName pn) {
+ this.packageName = pn;
+ }
+
+ public int compareTo(KickstartPackage that) {
+
+ final int EQUAL = 0;
+
+ if (this.equals(that)) {
+ return EQUAL;
+ }
+
+ int comparism = this.getKsData().getId().compareTo(that.getKsData().getId());
+ if (EQUAL != comparism) {
+ return comparism;
+ }
+
+ comparism = this.getPosition().compareTo(that.getPosition());
+ if (EQUAL != comparism){
+ return comparism;
+ }
+ return this.getPackageName().compareTo(that.getPackageName());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(final Object other) {
+ if (!(other instanceof KickstartPackage)) {
+ return false;
+ }
+ KickstartPackage that = (KickstartPackage) other;
+ return this.hashCode()== other.hashCode();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode() {
+ return new HashCodeBuilder()
+ .append(getKsData().getId())
+ .append(getPosition())
+ .append(getPackageName())
+ .toHashCode();
+ }
+
+ public String toString() {
+ return "packageName: ".concat(this.getKsData().getId().toString())
+ .concat(", ").concat(this.getPosition().toString())
+ .concat(", ").concat(this.getPackageName().getName());
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java b/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
index b8f1b7f..046bb14 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.kickstart.KickstartCommandName;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartDefaults;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
+import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.KickstartRawData;
import com.redhat.rhn.domain.kickstart.KickstartScript;
import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType;
@@ -38,7 +39,6 @@ import com.redhat.rhn.manager.kickstart.KickstartWizardHelper;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -209,7 +209,7 @@ public class KickstartBuilder {
"%packages tag.");
}
- List<PackageName> packageNames = new ArrayList<PackageName>();
+ Set<KickstartPackage> ksPackagesSet = new HashSet<KickstartPackage>();
for (Iterator<String> it = lines.iterator(); it.hasNext();) {
String currentLine = (String)it.next();
@@ -219,10 +219,10 @@ public class KickstartBuilder {
}
PackageName pn = PackageFactory.lookupOrCreatePackageByName(currentLine);
- packageNames.add(pn);
+ ksPackagesSet.add(new KickstartPackage(ksData, pn));
}
- ksData.getPackageNames().addAll(packageNames);
+ ksData.getKsPackages().addAll(ksPackagesSet);
}
/**
@@ -349,8 +349,8 @@ public class KickstartBuilder {
KickstartData ksdata = new KickstartData();
setupBasicInfo(label, ksdata, tree, virtualizationType);
- if (ksdata.getPackageNames() == null) {
- ksdata.setPackageNames(new ArrayList<PackageName>());
+ if (ksdata.getKsPackages() == null) {
+ ksdata.setKsPackages(new HashSet<KickstartPackage>());
}
buildCommands(ksdata, parser.getOptionLines(), tree, kickstartHost);
@@ -530,11 +530,11 @@ public class KickstartBuilder {
setPartitionScheme(cmd, ksdata);
cmd.processSkipKey(ksdata);
cmd.processRepos(ksdata);
- if (ksdata.getPackageNames() == null) {
- ksdata.setPackageNames(new ArrayList<PackageName>());
+ if (ksdata.getKsPackages() == null) {
+ ksdata.setKsPackages(new HashSet<KickstartPackage>());
}
PackageName pn = cmd.findPackageName("@ Base");
- ksdata.getPackageNames().add(pn);
+ ksdata.addKsPackage(new KickstartPackage(ksdata, pn));
cmd.store(ksdata);
return ksdata;
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java
index c519d0b..4ac4fdb 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java
@@ -195,7 +195,7 @@ public class KickstartBuilderTest extends BaseTestCaseWithUser {
KickstartData ksData = createBareKickstartData();
builder.buildPackages(ksData, lines);
- assertEquals(6, ksData.getPackageNames().size());
+ assertEquals(6, ksData.getKsPackages().size());
}
public void testBuidEmptyPackages() throws Exception {
@@ -205,7 +205,7 @@ public class KickstartBuilderTest extends BaseTestCaseWithUser {
List<String> lines = new LinkedList<String>();
KickstartData ksData = createBareKickstartData();
builder.buildPackages(ksData, lines);
- assertEquals(0, ksData.getPackageNames().size());
+ assertEquals(0, ksData.getKsPackages().size());
}
public void testBuildPreScripts() throws Exception {
@@ -332,7 +332,7 @@ public class KickstartBuilderTest extends BaseTestCaseWithUser {
KickstartData ksData = builder.createFromParser(parser, "mykslabel",
KickstartVirtualizationType.XEN_PARAVIRT, tree, null);
assertEquals(19, ksData.getCommands().size());
- assertEquals(100, ksData.getPackageNames().size());
+ assertEquals(100, ksData.getKsPackages().size());
assertEquals(1, ksData.getScripts().size());
KickstartScript preScript = ksData.getScripts().iterator().next();
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
index a3a5d08..ba27013 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
@@ -31,6 +31,7 @@ import com.redhat.rhn.domain.kickstart.KickstartDefaultRegToken;
import com.redhat.rhn.domain.kickstart.KickstartDefaults;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.KickstartInstallType;
+import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.KickstartPreserveFileList;
import com.redhat.rhn.domain.kickstart.KickstartScript;
import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType;
@@ -130,7 +131,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
KickstartData k = createTestKickstartData(user.getOrg());
assertNotNull(k);
assertNotNull(k.getId());
- assertNotNull(k.getPackageNames());
+ assertNotNull(k.getKsPackages());
KickstartData k2 = lookupById(user.getOrg(), k.getId());
assertEquals(k2.getLabel(), k.getLabel());
@@ -275,7 +276,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
KickstartData ksd = createKickstartWithOptions(user.getOrg());
assertNotNull(ksd);
assertNotNull(ksd.getId());
- assertNotNull(ksd.getPackageNames());
+ assertNotNull(ksd.getKsPackages());
KickstartFactory.saveKickstartData(ksd);
flushAndEvict(ksd);
@@ -463,8 +464,8 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
k.setKernelParams(KERNEL_PARAMS);
- k.addPackageName(pn);
- k.addPackageName(pn2);
+ k.addKsPackage(new KickstartPackage(k,pn));
+ k.addKsPackage(new KickstartPackage(k,pn2));
@@ -691,7 +692,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
verifySet(cloned.getDefaultRegTokens(), k.getDefaultRegTokens(), Token.class);
verifySet(cloned.getLogvols(), k.getLogvols(), KickstartCommand.class);
- verifyList(cloned.getPackageNames(), k.getPackageNames(), PackageName.class);
+ verifySet(cloned.getKsPackages(), k.getKsPackages(), PackageName.class);
verifySet(cloned.getPreserveFileLists(), k.getPreserveFileLists(), FileList.class);
verifySet(cloned.getRaids(), k.getRaids(), KickstartCommand.class);
verifySet(cloned.getVolgroups(), k.getVolgroups(), KickstartCommand.class);
@@ -712,7 +713,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
k.setCommands(null);
k.setDefaultRegTokens(null);
k.setIps(null);
- k.setPackageNames(null);
+ k.setKsPackages(null);
k.setPreserveFileLists(null);
k.setScripts(null);
// Now we deep copy it, save and reload
@@ -728,7 +729,8 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
assertTrue("Not instance of: " + clazz.getName(),
clazz.isInstance(cloned.iterator().next()));
}
-
+
+ /*
private void verifyList(List cloned, List orig, Class clazz) {
assertTrue("orig doesnt have any: " + clazz.getName(), orig.size() > 0);
assertTrue("cloned doesnt have any: " + clazz.getName(), cloned.size() > 0);
@@ -736,7 +738,8 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
assertTrue("Not instance of: " + clazz.getName(),
clazz.isInstance(cloned.iterator().next()));
}
-
+ */
+
public void testISRhelRevMethods() throws Exception {
KickstartData k = createKickstartWithChannel(user.getOrg());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
index d910996..0f3c88e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.kickstart;
import com.redhat.rhn.domain.kickstart.KickstartData;
+import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.rhnpackage.PackageFactory;
import com.redhat.rhn.domain.rhnpackage.PackageName;
@@ -27,9 +28,9 @@ import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
-import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
+import java.util.Set;
import java.util.StringTokenizer;
import javax.servlet.http.HttpServletRequest;
@@ -118,16 +119,13 @@ public class EditPackagesAction extends RhnAction {
}
private void prepareForm(KickstartData ksdata, DynaActionForm form) {
- List packageNames = ksdata.getPackageNames();
- if (packageNames != null && packageNames.size() > 0) {
+ Set ksPackages = ksdata.getKsPackages();
+ if (ksPackages != null && ksPackages.size() > 0) {
StringBuffer buf = new StringBuffer();
- StringBuffer buf2 = new StringBuffer();
- int i = 0;
- for (Iterator iter = packageNames.iterator(); iter.hasNext();) {
- PackageName pn = (PackageName) iter.next();
- buf.append(pn.getName());
+ for (Iterator iter = ksPackages.iterator(); iter.hasNext();) {
+ KickstartPackage pn = (KickstartPackage)iter.next();
+ buf.append(pn.getPackageName().getName());
buf.append("\n");
- i++;
}
form.set(PACKAGE_LIST, buf.toString());
}
@@ -136,12 +134,14 @@ public class EditPackagesAction extends RhnAction {
private void transferEdits(KickstartData ksdata, DynaActionForm form,
RequestContext ctx) {
- List packageNames = ksdata.getPackageNames();
- if (packageNames == null) {
- packageNames = new ArrayList();
- ksdata.setPackageNames(packageNames);
+
+ // first clear the kickstart packages set
+ Set ksPackages = ksdata.getKsPackages();
+ for (Iterator iter = ksPackages.iterator(); iter.hasNext();) {
+ KickstartFactory.removePackage((KickstartPackage)iter.next()); // remove from DB
+ iter.remove(); // remove from collection
}
- packageNames.clear();
+
String newPackages = form.getString(PACKAGE_LIST);
if (newPackages != null && newPackages.length() > 0) {
for (StringTokenizer strtok = new StringTokenizer(newPackages, "\n");
@@ -152,7 +152,12 @@ public class EditPackagesAction extends RhnAction {
continue;
}
PackageName pn = PackageFactory.lookupOrCreatePackageByName(pkg);
- packageNames.add(pn);
+ KickstartPackage ks_p = new KickstartPackage(ksdata,pn);
+
+ if (KickstartFactory.lookupKsPackageByKsDataAndPackageName(ksdata, pn).isEmpty()) {
+ ksdata.addKsPackage(ks_p); // save to collection
+ KickstartFactory.savePackage(ks_p); // save to DB
+ }
}
}
KickstartFactory.saveKickstartData(ksdata);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index df83b8a..61feda3 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -27,6 +27,7 @@ import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartDefaults;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.KickstartIpRange;
+import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.KickstartScript;
import com.redhat.rhn.domain.kickstart.KickstartableTree;
import com.redhat.rhn.domain.org.Org;
@@ -823,23 +824,23 @@ public class ProfileHandler extends BaseHandler {
loggedInUser.getOrg().getId());
// Set operations to determine deltas
- Set<PackageName> onlyInProfile1 =
- new HashSet<PackageName>(profile1.getPackageNames());
- onlyInProfile1.removeAll(profile2.getPackageNames());
+ Set<KickstartPackage> onlyInProfile1 =
+ new HashSet<KickstartPackage>(profile1.getKsPackages());
+ onlyInProfile1.removeAll(profile2.getKsPackages());
- Set<PackageName> onlyInProfile2 =
- new HashSet<PackageName>(profile2.getPackageNames());
- onlyInProfile2.removeAll(profile1.getPackageNames());
+ Set<KickstartPackage> onlyInProfile2 =
+ new HashSet<KickstartPackage>(profile2.getKsPackages());
+ onlyInProfile2.removeAll(profile1.getKsPackages());
// Convert the remaining into strings for return
Set<String> profile1PackageNameStrings = new HashSet<String>(onlyInProfile1.size());
- for (PackageName packageName : onlyInProfile1) {
- profile1PackageNameStrings.add(packageName.getName());
+ for (KickstartPackage ksPackage : onlyInProfile1) {
+ profile1PackageNameStrings.add(ksPackage.getPackageName().getName());
}
Set<String> profile2PackageNameStrings = new HashSet<String>(onlyInProfile2.size());
- for (PackageName packageName : onlyInProfile2) {
- profile2PackageNameStrings.add(packageName.getName());
+ for (KickstartPackage ksPackage : onlyInProfile2) {
+ profile2PackageNameStrings.add(ksPackage.getPackageName().getName());
}
// Package for return
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
index d8fd6ad..db1e611 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.common.security.PermissionException;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
+import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.rhnpackage.PackageFactory;
import com.redhat.rhn.domain.rhnpackage.PackageName;
@@ -28,6 +29,7 @@ import com.redhat.rhn.frontend.xmlrpc.kickstart.XmlRpcKickstartHelper;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
/**
* SoftwareHandler
@@ -57,8 +59,8 @@ public class SoftwareHandler extends BaseHandler {
checkKickstartPerms(user);
KickstartData ksdata = lookupKsData(ksLabel, user.getOrg());
List<String> list = new ArrayList<String>();
- for (PackageName p : ksdata.getPackageNames()) {
- list.add(p.getName());
+ for (KickstartPackage p : ksdata.getKsPackages()) {
+ list.add(p.getPackageName().getName());
}
return list;
}
@@ -86,11 +88,11 @@ public class SoftwareHandler extends BaseHandler {
User user = getLoggedInUser(sessionKey);
checkKickstartPerms(user);
KickstartData ksdata = lookupKsData(ksLabel, user.getOrg());
- List<PackageName> packages = ksdata.getPackageNames();
+ Set<KickstartPackage> packages = ksdata.getKsPackages();
packages.clear();
for (String p : packageList) {
PackageName pn = PackageFactory.lookupOrCreatePackageByName(p);
- packages.add(pn);
+ packages.add(new KickstartPackage(ksdata,pn));
}
KickstartFactory.saveKickstartData(ksdata);
return 1;
@@ -118,11 +120,12 @@ public class SoftwareHandler extends BaseHandler {
User user = getLoggedInUser(sessionKey);
checkKickstartPerms(user);
KickstartData ksdata = lookupKsData(ksLabel, user.getOrg());
- List<PackageName> packages = ksdata.getPackageNames();
+ Set<KickstartPackage> packages = ksdata.getKsPackages();
for (String p : packageList) {
PackageName pn = PackageFactory.lookupOrCreatePackageByName(p);
- if (!packages.contains(pn)) {
- packages.add(pn);
+ KickstartPackage ks_p = new KickstartPackage(ksdata, pn);
+ if (!packages.contains(ks_p)) {
+ packages.add(ks_p);
}
}
KickstartFactory.saveKickstartData(ksdata);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
index 1bcd982..ccf9536 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.xmlrpc.kickstart.profile.software.test;
import com.redhat.rhn.domain.kickstart.KickstartData;
+import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.frontend.xmlrpc.kickstart.profile.software.SoftwareHandler;
@@ -39,8 +40,8 @@ public class SoftwareHandlerTest extends BaseHandlerTestCase {
List<String> packages = handler.getSoftwareList(adminKey, ksProfile.getLabel());
// Note: the test profile created should have had at least 1 package listed
- assertTrue(ksProfile.getPackageNames().size() > 0);
- assertEquals(ksProfile.getPackageNames().size(), packages.size());
+ assertTrue(ksProfile.getKsPackages().size() > 0);
+ assertEquals(ksProfile.getKsPackages().size(), packages.size());
}
public void testSetSoftwareList() throws Exception {
@@ -53,16 +54,16 @@ public class SoftwareHandlerTest extends BaseHandlerTestCase {
int result = handler.setSoftwareList(adminKey, ksProfile.getLabel(), packages);
boolean pkgFound = false;
- for (Iterator<PackageName> itr = ksProfile.getPackageNames().iterator();
+ for (Iterator<KickstartPackage> itr = ksProfile.getKsPackages().iterator();
itr.hasNext();) {
- PackageName pkg = (PackageName) itr.next();
- if (pkg.getName().equals("gcc")) {
+ KickstartPackage pkg = (KickstartPackage) itr.next();
+ if (pkg.getPackageName().getName().equals("gcc")) {
pkgFound = true;
}
}
assertEquals(1, result);
- assertEquals(ksProfile.getPackageNames().size(), 1);
+ assertEquals(ksProfile.getKsPackages().size(), 1);
assertEquals(pkgFound, true);
}
@@ -70,7 +71,7 @@ public class SoftwareHandlerTest extends BaseHandlerTestCase {
KickstartData ksProfile = KickstartDataTest.createKickstartWithProfile(admin);
- int numPackagesInitial = ksProfile.getPackageNames().size();
+ int numPackagesInitial = ksProfile.getKsPackages().size();
List<String> packages = new ArrayList<String>();
packages.add("bash");
@@ -80,7 +81,7 @@ public class SoftwareHandlerTest extends BaseHandlerTestCase {
assertEquals(1, result);
assertEquals(numPackagesInitial + packages.size(),
- ksProfile.getPackageNames().size());
+ ksProfile.getKsPackages().size());
// attempt to add the same packages again and verify that the list did not change
// (i.e. we don't allow duplicates)
@@ -88,6 +89,6 @@ public class SoftwareHandlerTest extends BaseHandlerTestCase {
assertEquals(1, result);
assertEquals(numPackagesInitial + packages.size(),
- ksProfile.getPackageNames().size());
+ ksProfile.getKsPackages().size());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
index ca80dac..870ec17 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.kickstart.KickstartCommandName;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.KickstartIpRange;
+import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.KickstartScript;
import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType;
import com.redhat.rhn.domain.kickstart.KickstartableTree;
@@ -185,8 +186,7 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
public void testDownloadKickstart() throws Exception {
KickstartData ks1 = KickstartDataTest.createKickstartWithProfile(admin);
- ks1.addPackageName(PackageFactory.lookupOrCreatePackageByName(
- "blahPackage"));
+ ks1.addKsPackage(new KickstartPackage(ks1, PackageFactory.lookupOrCreatePackageByName("blahPackage")));
ActivationKey key = ActivationKeyTest.createTestActivationKey(admin);
ks1.addDefaultRegToken(key.getToken());
@@ -449,20 +449,20 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
// Clear any packages on the profile so we have a known starting state
KickstartData ks1 = KickstartDataTest.createKickstartWithProfile(admin);
- ks1.getPackageNames().clear();
+ ks1.getKsPackages().clear();
KickstartData ks2 = KickstartDataTest.createKickstartWithProfile(admin);
- ks2.getPackageNames().clear();
+ ks2.getKsPackages().clear();
Package package1 = PackageTest.createTestPackage(admin.getOrg());
Package package2 = PackageTest.createTestPackage(admin.getOrg());
Package package3 = PackageTest.createTestPackage(admin.getOrg());
- ks1.addPackageName(package1.getPackageName());
- ks1.addPackageName(package2.getPackageName());
+ ks1.addKsPackage(new KickstartPackage(ks1,package1.getPackageName()));
+ ks1.addKsPackage(new KickstartPackage(ks1,package2.getPackageName()));
- ks2.addPackageName(package1.getPackageName());
- ks2.addPackageName(package3.getPackageName());
+ ks2.addKsPackage(new KickstartPackage(ks2,package1.getPackageName()));
+ ks2.addKsPackage(new KickstartPackage(ks2,package3.getPackageName()));
KickstartFactory.saveKickstartData(ks1);
KickstartFactory.saveKickstartData(ks2);
@@ -494,11 +494,11 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
// Clear any packages on the profile so we have a known starting state
KickstartData ks1 = KickstartDataTest.createKickstartWithProfile(admin);
- ks1.getPackageNames().clear();
+ ks1.getKsPackages().clear();
Package package1 = PackageTest.createTestPackage(admin.getOrg());
- ks1.addPackageName(package1.getPackageName());
+ ks1.addKsPackage(new KickstartPackage(ks1,package1.getPackageName()));
KickstartFactory.saveKickstartData(ks1);
@@ -519,10 +519,10 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
// Clear any packages on the profile so we have a known starting state
KickstartData ks1 = KickstartDataTest.createKickstartWithProfile(admin);
- ks1.getPackageNames().clear();
+ ks1.getKsPackages().clear();
KickstartData ks2 = KickstartDataTest.createKickstartWithProfile(admin);
- ks2.getPackageNames().clear();
+ ks2.getKsPackages().clear();
KickstartFactory.saveKickstartData(ks1);
KickstartFactory.saveKickstartData(ks2);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java
index 23f8353..e355330 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java
@@ -63,7 +63,7 @@ public class KickstartDataSerializer implements XmlRpcCustomSerializer {
helper.add("kernelParams", kd.getKernelParams());
helper.add("nonChrootPost", kd.getNonChrootPost());
helper.add("verboseUp2date", kd.getVerboseUp2date());
- helper.add("packageNames", kd.getPackageNames());
+ helper.add("packageNames", kd.getKsPackages());
helper.add("commands", kd.getCommands());
helper.add("defaultRegTokens", kd.getDefaultRegTokens());
helper.add("ips", kd.getIps());
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 87ff227..7b399f0 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.kickstart.KickstartCommand;
import com.redhat.rhn.domain.kickstart.KickstartData;
+import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.KickstartScript;
import com.redhat.rhn.domain.kickstart.KickstartSession;
import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType;
@@ -27,7 +28,6 @@ import com.redhat.rhn.domain.kickstart.cobbler.CobblerSnippet;
import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
import com.redhat.rhn.domain.rhnpackage.Package;
import com.redhat.rhn.domain.rhnpackage.PackageFactory;
-import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.domain.token.ActivationKey;
import com.redhat.rhn.domain.token.ActivationKeyFactory;
import com.redhat.rhn.domain.token.Token;
@@ -443,8 +443,8 @@ public class KickstartFormatter {
*/
private String getPackages() {
StringBuffer buf = new StringBuffer();
- for (Iterator itr = ksdata.getPackageNames().iterator(); itr.hasNext();) {
- buf.append(((PackageName)itr.next()).getName() + NEWLINE);
+ for (Iterator itr = ksdata.getKsPackages().iterator(); itr.hasNext();) {
+ buf.append(((KickstartPackage)itr.next()).getPackageName().getName() + NEWLINE);
}
if (KickstartVirtualizationType.paraHost().equals(ksdata.getKickstartDefaults().
getVirtualizationType())) {
commit 737247f4d2dc0a89569702d9bd7bc590fa350094
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 26 10:32:47 2009 +0100
Automatic commit of package [spacewalk-backend] release [0.7.10-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 12a55a7..e834994 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.7.9
+Version: 0.7.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -582,6 +582,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Oct 26 2009 Jan Pazdziora 0.7.10-1
+- reporting: added --info options and documentation of reports and fields
+
* Fri Oct 23 2009 Jan Pazdziora 0.7.9-1
- reporting: added report errata-list and errata-system
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 3892c7f..cbed8c4 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.7.9-1 backend/
+0.7.10-1 backend/
commit 72a5d008dbe9bd1452d85fe5802fd432518a0b70
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 26 10:14:40 2009 +0100
reporting: document the --info option in the man page.
diff --git a/backend/satellite_tools/spacewalk-report.sgml b/backend/satellite_tools/spacewalk-report.sgml
index 5f8c5c2..7ba8d5d 100644
--- a/backend/satellite_tools/spacewalk-report.sgml
+++ b/backend/satellite_tools/spacewalk-report.sgml
@@ -18,6 +18,7 @@ Generate reports from Spacewalk server in csv format
<cmdsynopsis>
<command>spacewalk-report</command>
<arg>--db=<replaceable>connect_string</replaceable></arg>
+ <arg>--info</arg>
</cmdsynopsis>
<cmdsynopsis>
<command>spacewalk-report</command>
@@ -29,9 +30,11 @@ Generate reports from Spacewalk server in csv format
<sbr />
<arg>--db=<replaceable>connect-string</replaceable></arg>
<sbr />
+ <arg>--info</arg>
+ <sbr />
<arg choice='plain'><replaceable>report-name</replaceable></arg>
<sbr />
- <arg>--list-fields</arg>
+ <arg>--list-fields <arg>--info</arg></arg>
<sbr />
<arg choice='plain'>other report specific options</arg>
</cmdsynopsis>
@@ -61,6 +64,17 @@ Generate reports from Spacewalk server in csv format
<RefSect1><Title>General Options</Title>
<variablelist>
<varlistentry>
+ <term>--info</term>
+ <listitem>
+ <para>When listing available reports, also print
+ synopsis for each report.</para>
+
+ <para>When used with report name specified, print
+ synopsis and description for the report, instead
+ of running the report.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>--multival-on-rows</term>
<listitem>
<para>If certain field can have multiple values, you can
@@ -104,6 +118,13 @@ Generate reports from Spacewalk server in csv format
report has, one field name per line.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>--info</term>
+ <listitem>
+ <para>Used with <option>--list-fields</option>, the list
+ of fields has description shown as well.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</RefSect1>
commit 10506a941957a10d0cfd690e408ca7a6bcdea89f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 26 10:01:17 2009 +0100
449167 - it looks better when architecture column is not thin column
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
index 71c525f..95b114e 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
@@ -56,7 +56,7 @@
<a href="/rhn/software/packages/Details.do?sid=${param.sid}&id_combo=${current.idCombo}">
${current.nvre}</a>
</rl:column>
- <rl:column headerkey="packagelist.jsp.packagearch" bound="false" styleclass="thin-column">
+ <rl:column headerkey="packagelist.jsp.packagearch" bound="false">
<c:choose>
<c:when test ="${not empty current.arch}">${current.arch}</c:when>
<c:otherwise><bean:message key="packagelist.jsp.notspecified"/></c:otherwise>
14 years, 6 months
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/reposync.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 5e04bd6ad1769e3df33a67e171a9b0605ccdd5e5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Oct 26 13:24:05 2009 +0100
removed redundant else; we call associate_package anyway
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index b1b57e6..298f740 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -143,9 +143,7 @@ class RepoSync:
self.channel['org_id'], md5)
if pid is None:
self.upload_package(pack, path)
- self.associate_package(pack, md5)
- else:
- self.associate_package(pack, md5) #package is already on the satellite, lets just associate
+ self.associate_package(pack, md5)
if self.url.find("file://") < 0:
os.remove(path)
14 years, 6 months
Changes to 'refs/tags/rhncfg-5.9.11-1'
by Miroslav Suchý
Tag 'rhncfg-5.9.11-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-10-27 10:39 +0000
Tagging package [rhncfg] version [5.9.11-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-java-0.7.13-1:
Joshua Roys (2):
Diff SELinux contexts
Make debugging osa* network/jabber issues easier
Justin Sherrill (1):
525561 - fixing issue where ksdata without associated kickstart defaults would try to be synced to cobbler and fail
Miroslav Suchý (1):
Automatic commit of package [rhncfg] release [5.9.11-1].
Tomas Lestach (1):
checkstyle errors removed
---
client/tools/osad/src/jabber_lib.py | 3
client/tools/rhncfg/config_common/file_utils.py | 16 +++
client/tools/rhncfg/rhncfg.spec | 5 -
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 5 -
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 8 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 46 +++++-----
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java | 16 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java | 8 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 13 +-
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java | 11 +-
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java | 7 +
rel-eng/packages/rhncfg | 2
15 files changed, 95 insertions(+), 51 deletions(-)
---
14 years, 6 months
Changes to 'refs/tags/osad-5.9.22-1'
by Miroslav Suchý
Tag 'osad-5.9.22-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-10-27 10:51 +0000
Tagging package [osad] version [5.9.22-1] in directory [client/tools/osad/].
Changes since spacewalk-java-0.7.13-1:
Joshua Roys (2):
Diff SELinux contexts
Make debugging osa* network/jabber issues easier
Justin Sherrill (1):
525561 - fixing issue where ksdata without associated kickstart defaults would try to be synced to cobbler and fail
Miroslav Suchý (2):
Automatic commit of package [rhncfg] release [5.9.11-1].
Automatic commit of package [osad] release [5.9.22-1].
Tomas Lestach (1):
checkstyle errors removed
---
client/tools/osad/osad.spec | 5 -
client/tools/osad/src/jabber_lib.py | 3
client/tools/rhncfg/config_common/file_utils.py | 16 +++
client/tools/rhncfg/rhncfg.spec | 5 -
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 5 -
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 8 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 46 +++++-----
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java | 16 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java | 8 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 13 +-
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java | 11 +-
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java | 7 +
rel-eng/packages/osad | 2
rel-eng/packages/rhncfg | 2
17 files changed, 100 insertions(+), 53 deletions(-)
---
14 years, 6 months
client/tools rel-eng/packages
by Miroslav Suchý
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/osad | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c8e0dc69a0d77cf95524e896f19ce9fea6832a09
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Oct 27 11:51:57 2009 +0100
Automatic commit of package [osad] release [5.9.22-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index e7bc369..6b465af 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -9,7 +9,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.21
+Version: 5.9.22
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -236,6 +236,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {}
# $Id$
%changelog
+* Tue Oct 27 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.22-1
+- Make debugging osa* network/jabber issues easier (joshua.roys(a)gtri.gatech.edu)
+
* Tue Aug 04 2009 Jan Pazdziora 5.9.21-1
- 514320 - open the pid file with append
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index bb7e89c..7e1b7bd 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.9.21-1 client/tools/osad/
+5.9.22-1 client/tools/osad/
14 years, 6 months
3 commits - client/tools rel-eng/packages
by Miroslav Suchý
client/tools/osad/src/jabber_lib.py | 3 +++
client/tools/rhncfg/config_common/file_utils.py | 16 ++++++++++++++--
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
4 files changed, 22 insertions(+), 4 deletions(-)
New commits:
commit 44719baf2100216b716fbd2ac457debfe216b157
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Oct 27 11:39:25 2009 +0100
Automatic commit of package [rhncfg] release [5.9.11-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 9d8b5a8..07cbb11 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.9.10
+Version: 5.9.11
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue Oct 27 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.11-1
+- Diff SELinux contexts (joshua.roys(a)gtri.gatech.edu)
+
* Wed Sep 02 2009 Michael Mraka <michael.mraka(a)redhat.com> 5.9.10-1
- Add symlink capability to config management (joshua.roys(a)gtri.gatech.edu)
- 519195 - fix typos in rhncfg-manager manual page
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 94ad1ff..3eed1e7 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.10-1 client/tools/rhncfg/
+5.9.11-1 client/tools/rhncfg/
commit 08b218ae7a49870c9e4290d257fc9bec5b6974bb
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Mon Oct 26 11:35:12 2009 -0400
Make debugging osa* network/jabber issues easier
diff --git a/client/tools/osad/src/jabber_lib.py b/client/tools/osad/src/jabber_lib.py
index 5c615ae..344a91b 100644
--- a/client/tools/osad/src/jabber_lib.py
+++ b/client/tools/osad/src/jabber_lib.py
@@ -259,12 +259,15 @@ class Runner:
sys.exit(1)
except socket.error, e:
self.print_message(js, "socket error")
+ log_error(extract_traceback())
continue
except JabberError, e:
self.print_message(js, "JabberError")
+ log_error(extract_traceback())
continue
except SSLError, e:
self.print_message(js, "SSLError")
+ log_error(extract_traceback())
continue
else:
# Ran out of Jabber servers to try
commit 32d5d9a1471cfed0316371c491ed8648e8164ac2
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Fri Sep 25 07:25:09 2009 -0400
Diff SELinux contexts
diff --git a/client/tools/rhncfg/config_common/file_utils.py b/client/tools/rhncfg/config_common/file_utils.py
index c34c605..3e19550 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -18,6 +18,12 @@ import time
import tempfile
import base64
from config_common.rhn_log import log_debug
+try:
+ from selinux import lgetfilecon
+except:
+ # on rhel4 we do not support selinux
+ def lgetfilecon(path):
+ return [0, '']
from config_common import utils
@@ -81,7 +87,13 @@ class FileProcessor:
temp_file, temp_dirs = self.process(file_struct)
path = file_struct['path']
- result = None
+ sectx_result = ''
+ result = ''
+
+ cur_sectx = lgetfilecon(path)[1]
+ if file_struct.has_key('selinux_ctx'):
+ if cur_sectx != file_struct['selinux_ctx']:
+ sectx_result = "SELinux contexts differ! Current context: %s\n" % cur_sectx
if file_struct['filetype'] == 'symlink':
try:
@@ -101,7 +113,7 @@ class FileProcessor:
result = pipe.read()
os.unlink(temp_file)
- return result
+ return sectx_result + result
def _validate_struct(self, file_struct):
for k in self.file_struct_fields.keys():
14 years, 6 months
Changes to 'refs/tags/spacewalk-java-0.7.14-1'
by Tomas Lestach
Tag 'spacewalk-java-0.7.14-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2009-10-27 10:30 +0000
Tagging package [spacewalk-java] version [0.7.14-1] in directory [java/].
Changes since spacewalk-java-0.7.13-1:
Justin Sherrill (1):
525561 - fixing issue where ksdata without associated kickstart defaults would try to be synced to cobbler and fail
Tomas Lestach (2):
checkstyle errors removed
Automatic commit of package [spacewalk-java] release [0.7.14-1].
---
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 5 -
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 8 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 46 +++++-----
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java | 16 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java | 8 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 13 +-
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java | 11 +-
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java | 7 +
java/spacewalk-java.spec | 7 +
rel-eng/packages/spacewalk-java | 2
13 files changed, 80 insertions(+), 49 deletions(-)
---
14 years, 6 months