Changes to 'refs/tags/spacewalk-java-1.8.46-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.46-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-17 08:54 +0000
Tagging package [spacewalk-java] version [1.8.46-1] in directory [java/].
Changes since spacewalk-backend-1.8.19-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.8.46-1].
---
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
12 years, 2 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 5ca5d845f2b838cc33b663313472335d262bdba7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 17 10:54:24 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.46-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4067f69..405f5bb 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.45
+Version: 1.8.46
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Apr 17 2012 Jan Pazdziora 1.8.46-1
+- fix ErrataHandlerTest (tlestach(a)redhat.com)
+- 812053 - fix the ErrataHandler.clone method (tlestach(a)redhat.com)
+- create a test erratum with keyword (tlestach(a)redhat.com)
+- refactor PackageEvr handling II (tlestach(a)redhat.com)
+
* Fri Apr 13 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.45-1
- 809579 - make system snapshot when changing server entitlements using API
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 3a5bd77..e3ab2e7 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.45-1 java/
+1.8.46-1 java/
12 years, 2 months
Changes to 'refs/tags/spacewalk-backend-1.8.19-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.8.19-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-17 08:53 +0000
Tagging package [spacewalk-backend] version [1.8.19-1] in directory [backend/].
Changes since spacewalk-utils-1.8.6-1:
Jan Pazdziora (3):
Workaround httplib in 2.4 which did not have the responses dictionary.
The mod_wsgi insists on having something after the numeric value on the Status line.
Automatic commit of package [spacewalk-backend] release [1.8.19-1].
Milan Zazrivec (1):
Create deploy.sql on PostgreSQL as well
Miroslav Suchý (1):
812789 - write nicer error message in case you are missing rpm files
Tomas Lestach (4):
refactor PackageEvr handling II
create a test erratum with keyword
812053 - fix the ErrataHandler.clone method
fix ErrataHandlerTest
---
backend/satellite_tools/disk_dumper/iss.py | 2
backend/spacewalk-backend.spec | 9 +
backend/wsgi/wsgiRequest.py | 7 +
java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java | 8 -
java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 1
java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrComparableTest.java | 7 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java | 15 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 10 --
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java | 2
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java | 10 --
java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 8 -
java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 46 +++++-----
rel-eng/packages/spacewalk-backend | 2
spacewalk/setup/lib/Spacewalk/Setup.pm | 15 +++
14 files changed, 80 insertions(+), 62 deletions(-)
---
12 years, 2 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 9 ++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 5d9eec85a65b547ae62da0b1c13a1aa967ed9f21
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 17 10:53:44 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.19-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index dc6bb20..54f6b4c 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.18
+Version: 1.8.19
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -673,6 +673,13 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Apr 17 2012 Jan Pazdziora 1.8.19-1
+- The mod_wsgi insists on having something after the numeric value on the
+ Status line.
+- Workaround httplib in 2.4 which did not have the responses dictionary.
+- 812789 - write nicer error message in case you are missing rpm files
+ (msuchy(a)redhat.com)
+
* Mon Apr 16 2012 Jan Pazdziora 1.8.18-1
- Sadly, even if cobbler 2.2 is in EPELs, it is not in Fedora -- we need to
require just 2.0.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 012a040..56a58ba 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.18-1 backend/
+1.8.19-1 backend/
12 years, 2 months
2 commits - backend/wsgi
by Jan Pazdziora
backend/wsgi/wsgiRequest.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 7606e03e7626b4a3cf210e7f6577455fbbca9fce
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 17 10:49:50 2012 +0200
The mod_wsgi insists on having something after the numeric value on the Status line.
Addressing
File "/usr/lib/python2.4/site-packages/spacewalk/server/apacheRequest.py", line 368, in response
self.req.send_http_header()
File "/usr/share/rhn/wsgi/wsgiRequest.py", line 80, in send_http_header
self.start_response(self.status, self.headers_out.items())
ValueError: status message was not supplied
diff --git a/backend/wsgi/wsgiRequest.py b/backend/wsgi/wsgiRequest.py
index df5c0a9..b8d4268 100644
--- a/backend/wsgi/wsgiRequest.py
+++ b/backend/wsgi/wsgiRequest.py
@@ -68,8 +68,11 @@ class WsgiRequest:
self.headers_out.add(i[0], i[1])
if hasattr(httplib, "responses"):
- # httplib in 2.4 did not have the responses dictionary
self.status = self.status + " " + httplib.responses[int(self.status)]
+ else:
+ # httplib in 2.4 did not have the responses dictionary
+ # and mod_wsgi insists on having something after the numeric value
+ self.status = self.status + " Status " + self.status
if len(self.content_type) > 0:
self.headers_out['Content-Type'] = self.content_type
commit 5a0f7800223db43eca040017e142346be60796dd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 17 10:09:29 2012 +0200
Workaround httplib in 2.4 which did not have the responses dictionary.
Addressing
File "/usr/lib/python2.4/site-packages/spacewalk/server/apacheRequest.py", line 368, in response
self.req.send_http_header()
File "/usr/share/rhn/wsgi/wsgiRequest.py", line 70, in send_http_header
self.status = self.status + " " + httplib.responses[int(self.status)]
AttributeError: 'module' object has no attribute 'responses'
diff --git a/backend/wsgi/wsgiRequest.py b/backend/wsgi/wsgiRequest.py
index 140192f..df5c0a9 100644
--- a/backend/wsgi/wsgiRequest.py
+++ b/backend/wsgi/wsgiRequest.py
@@ -67,7 +67,9 @@ class WsgiRequest:
for i in self.err_headers_out.items():
self.headers_out.add(i[0], i[1])
- self.status = self.status + " " + httplib.responses[int(self.status)]
+ if hasattr(httplib, "responses"):
+ # httplib in 2.4 did not have the responses dictionary
+ self.status = self.status + " " + httplib.responses[int(self.status)]
if len(self.content_type) > 0:
self.headers_out['Content-Type'] = self.content_type
12 years, 2 months
3 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 1 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 10 ++++------
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit efcb99288904f7b02ca689075200560e6ebb528a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Apr 16 17:13:07 2012 +0200
fix ErrataHandlerTest
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java
index 2c7ef0d..515f52b 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java
@@ -444,7 +444,7 @@ public class ErrataHandlerTest extends BaseHandlerTestCase {
Map errataInfo = new HashMap();
- String advisoryName = RandomStringUtils.random(37);
+ String advisoryName = RandomStringUtils.random(101);
populateErrataInfo(errataInfo);
errataInfo.put("advisory_name", advisoryName);
commit 9670d422b2f707f51c4a22e21a16a070d3b867b3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Apr 16 17:12:04 2012 +0200
812053 - fix the ErrataHandler.clone method
return cloned errata list (not an empty array)
rename confusing inheritAllPackages -> inheritPackages
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index d2b6bc9..37c2072 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -879,7 +879,7 @@ public class ErrataHandler extends BaseHandler {
private Object[] clone(String sessionKey, String channelLabel,
- List<String> advisoryNames, boolean inheritAllPackages) {
+ List<String> advisoryNames, boolean inheritPackages) {
User loggedInUser = getLoggedInUser(sessionKey);
Logger log = Logger.getLogger(ErrataFactory.class);
@@ -892,7 +892,7 @@ public class ErrataHandler extends BaseHandler {
}
//if calling cloneAsOriginal, do additional checks to verify a clone
- if (!inheritAllPackages) {
+ if (inheritPackages) {
if (!channel.isCloned()) {
throw new InvalidChannelException("Cloned channel expected: " +
channel.getLabel());
@@ -918,8 +918,6 @@ public class ErrataHandler extends BaseHandler {
List<Errata> errataToClone = new ArrayList<Errata>();
List<Errata> errataToPublish = new ArrayList<Errata>();
- List<Errata> toReturn = new ArrayList<Errata>();
-
//We loop through once, making sure all the errata exist
for (String advisory : advisoryNames) {
Errata toClone = lookupErrata(advisory, loggedInUser.getOrg());
@@ -946,12 +944,12 @@ public class ErrataHandler extends BaseHandler {
//Now publish them all to the channel in a single shot
List<Errata> published = ErrataFactory.publishToChannel(errataToPublish, channel,
- loggedInUser, inheritAllPackages);
+ loggedInUser, inheritPackages);
for (Errata e : published) {
ErrataFactory.save(e);
}
- return toReturn.toArray();
+ return published.toArray();
}
commit 8ba2cd0ffb48d19281c45ad5894a5c766d2df3f9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Apr 16 17:04:14 2012 +0200
create a test erratum with keyword
diff --git a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java
index c6e4b30..63b1e9d 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java
@@ -304,6 +304,7 @@ public class ErrataFactoryTest extends BaseTestCaseWithUser {
e.setAdvisoryName(name);
e.setAdvisoryRel(new Long(2));
e.setLocallyModified(Boolean.FALSE);
+ e.addKeyword("keyword");
Package testPackage = PackageTest.createTestPackage();
ErrataFile ef;
12 years, 2 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java | 8 -
java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrComparableTest.java | 7 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java | 15 +--
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java | 10 --
java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 8 -
java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 46 +++++-----
6 files changed, 43 insertions(+), 51 deletions(-)
New commits:
commit 02a668f857f52316e13f3c41d19f6b1942415beb
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Apr 16 15:55:32 2012 +0200
refactor PackageEvr handling II
diff --git a/java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java b/java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java
index 941bf96..18fa523 100644
--- a/java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java
@@ -43,6 +43,7 @@ import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.errata.test.ErrataFactoryTest;
import com.redhat.rhn.domain.rhnpackage.PackageArch;
import com.redhat.rhn.domain.rhnpackage.PackageEvr;
+import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory;
import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.server.Server;
@@ -448,11 +449,8 @@ public class ActionFactoryTest extends RhnBaseTestCase {
d.setPackageName(name);
//create packageEvr
- PackageEvr evr = new PackageEvr();
- evr.setEpoch("" + System.currentTimeMillis());
- evr.setRelease("1.0");
- evr.setVersion("2.0");
-
+ PackageEvr evr = PackageEvrFactory.lookupOrCreatePackageEvr("" +
+ System.currentTimeMillis(), "2.0", "1.0");
d.setEvr(evr);
((PackageAction) newA).addDetail(d);
}
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrComparableTest.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrComparableTest.java
index 9bbf90d..7d0997a 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrComparableTest.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrComparableTest.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.domain.rhnpackage.test;
import com.redhat.rhn.domain.rhnpackage.PackageEvr;
+import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory;
import com.redhat.rhn.testing.RhnBaseTestCase;
import org.apache.commons.lang.StringUtils;
@@ -65,10 +66,8 @@ public class PackageEvrComparableTest extends RhnBaseTestCase {
private PackageEvr create(String evr) {
String[] values = split(evr);
- PackageEvr result = new PackageEvr();
- result.setEpoch(values[0]);
- result.setVersion(values[1]);
- result.setRelease(values[2]);
+ PackageEvr result = PackageEvrFactory.lookupOrCreatePackageEvr(
+ values[0], values[1], values[2]);
return result;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java
index 7a1dc96..9611a6a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.messaging.MessageQueue;
import com.redhat.rhn.common.util.DatePicker;
import com.redhat.rhn.domain.rhnpackage.PackageEvr;
+import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.rhnset.SetCleanup;
import com.redhat.rhn.domain.user.User;
@@ -115,15 +116,13 @@ public class SchedulePackageUpgradeAction extends RhnAction implements Listable
String[] existingParts = splitEvr(existing.getNvre());
String[] itemParts = splitEvr(item.getNvre());
- PackageEvr existingEvr = new PackageEvr();
- existingEvr.setEpoch(existingParts[0]);
- existingEvr.setVersion(existingParts[1]);
- existingEvr.setRelease(existingParts[2]);
+ PackageEvr existingEvr = PackageEvrFactory
+ .lookupOrCreatePackageEvr(existingParts[0],
+ existingParts[1], existingParts[2]);
- PackageEvr itemEvr = new PackageEvr();
- itemEvr.setEpoch(itemParts[0]);
- itemEvr.setVersion(itemParts[1]);
- itemEvr.setRelease(itemParts[2]);
+ PackageEvr itemEvr = PackageEvrFactory
+ .lookupOrCreatePackageEvr(itemParts[0],
+ itemParts[1], itemParts[2]);
if (existingEvr.compareTo(itemEvr) < 0) {
packageNameIdsToItems.put(item.getIdOne() + "|" +
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java
index 276b447..7341041 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java
@@ -32,6 +32,7 @@ import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
import com.redhat.rhn.domain.kickstart.test.KickstartSessionTest;
import com.redhat.rhn.domain.rhnpackage.Package;
import com.redhat.rhn.domain.rhnpackage.PackageEvr;
+import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory;
import com.redhat.rhn.domain.rhnpackage.profile.ProfileFactory;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.server.Server;
@@ -319,13 +320,10 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
PackageManagerTest.addPackageToChannel("auto-kickstart-TestBootImage", c);
Package p = PackageManagerTest.
addPackageToChannel("up2date", c);
- PackageEvr pevr = p.getPackageEvr();
- pevr.setEpoch("0");
- pevr.setVersion(KickstartScheduleCommand.UP2DATE_VERSION);
- pevr.setRelease("0");
+ PackageEvr pevr = PackageEvrFactory.lookupOrCreatePackageEvr("0",
+ KickstartScheduleCommand.UP2DATE_VERSION, "0");
+ p.setPackageEvr(pevr);
TestUtils.saveAndFlush(p);
- TestUtils.saveAndFlush(pevr);
-
}
// Like the number of params on this one? Nice eh? At least its private and
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java
index 0def9ab..f1be880 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java
@@ -456,12 +456,10 @@ public class PackageManagerTest extends BaseTestCaseWithUser {
if (p == null) {
p = PackageManagerTest.
addPackageToSystemAndChannel("up2date", s, c);
- PackageEvr pevr = p.getPackageEvr();
- pevr.setEpoch("0");
- pevr.setVersion(version);
- pevr.setRelease("0");
+ PackageEvr pevr = PackageEvrFactory.lookupOrCreatePackageEvr("0",
+ version, "0");
+ p.setPackageEvr(pevr);
TestUtils.saveAndFlush(p);
- TestUtils.saveAndFlush(pevr);
}
else {
PackageManagerTest.associateSystemToPackage(s, p);
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java
index 146879c..e02c158 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java
@@ -18,6 +18,7 @@ package com.redhat.rhn.taskomatic.task.repomd;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.rhnpackage.PackageEvr;
+import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory;
import com.redhat.rhn.frontend.dto.PackageDto;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
import com.redhat.rhn.manager.task.TaskManager;
@@ -322,33 +323,32 @@ public class PrimaryXmlWriter extends RepomdWriter {
* @return package evr object
*/
private static PackageEvr parseEvr(String evr) {
- PackageEvr evrObj = new PackageEvr();
-
- if (evr == null) {
- return evrObj;
- }
-
- String[] parts = evr.split(":");
- String vr;
- if (parts.length != 1) {
- evrObj.setEpoch(parts[0]);
- vr = parts[1];
- }
- else {
- vr = parts[0];
- }
+ String epoch = null, version = null, release = null;
+
+ if (evr != null) {
+ String[] parts = evr.split(":");
+ String vr;
+ if (parts.length != 1) {
+ epoch = parts[0];
+ vr = parts[1];
+ }
+ else {
+ vr = parts[0];
+ }
- int dash = vr.lastIndexOf("-");
+ int dash = vr.lastIndexOf("-");
- if (dash == -1) {
- evrObj.setVersion(vr);
- }
- else {
- evrObj.setVersion(vr.substring(0, dash));
- evrObj.setRelease(vr.substring(dash + 1));
+ if (dash == -1) {
+ version = vr;
+ }
+ else {
+ version = vr.substring(0, dash);
+ release = vr.substring(dash + 1);
+ }
}
- return evrObj;
+ return PackageEvrFactory.lookupOrCreatePackageEvr(epoch, version,
+ release);
}
/**
12 years, 2 months
backend/satellite_tools
by Miroslav Suchý
backend/satellite_tools/disk_dumper/iss.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit d3f88ad2629c3c36d1fc623643599798cb9b2576
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 16 15:23:39 2012 +0200
812789 - write nicer error message in case you are missing rpm files
this can happen when you are exporting channel which has been synced using --no-rpms
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py
index 668f4b1..c459740 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -883,6 +883,8 @@ class Dumper(dumper.XML_Dumper):
#get the dirs to the rpm
dirs_to_rpm = os.path.split(path_to_rpm)[0]
+ if (not rpm['path']):
+ raise ISSError("Error: Missing RPM under the satellite mount point. (Package id: %s)" % rpm['id'], "")
#get the path to the rpm from under the satellite's mountpoint
satellite_path = os.path.join(CFG.MOUNT_POINT, rpm['path'])
12 years, 2 months
spacewalk/setup
by Milan Zazrivec
spacewalk/setup/lib/Spacewalk/Setup.pm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 2f80ca2f832b02d51e02987aa9999c1f87b93a31
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Apr 16 14:56:45 2012 +0200
Create deploy.sql on PostgreSQL as well
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 5e77650..ed4184f 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -39,6 +39,9 @@ use constant SHARED_DIR => "/usr/share/spacewalk/setup";
use constant POSTGRESQL_SCHEMA_FILE => File::Spec->catfile("/etc", "sysconfig",
'rhn', 'postgres', 'main.sql');
+use constant POSTGRESQL_DEPLOY_FILE => File::Spec->catfile("/etc", "sysconfig",
+ 'rhn', 'postgres', 'deploy.sql');
+
use constant DEFAULT_ANSWER_FILE_GLOB =>
SHARED_DIR . '/defaults.d/*.conf';
@@ -949,7 +952,17 @@ sub postgresql_populate_db {
}
}
- my $sat_schema_deploy = POSTGRESQL_SCHEMA_FILE;
+ my $sat_schema = POSTGRESQL_SCHEMA_FILE;
+ my $sat_schema_deploy = POSTGRESQL_DEPLOY_FILE;
+
+ system_or_exit([ "/usr/bin/rhn-config-schema.pl",
+ "--source=" . $sat_schema,
+ "--target=" . $sat_schema_deploy,
+ "--tablespace-name=None" ],
+ 22,
+ 'There was a problem populating the deploy.sql file.',
+ );
+
my $logfile = DB_POP_LOG_FILE;
my @opts = ('spacewalk-sql', '--select-mode-direct', $sat_schema_deploy);
12 years, 2 months
Changes to 'refs/tags/spacewalk-utils-1.8.6-1'
by Tomas Lestach
Tag 'spacewalk-utils-1.8.6-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-04-16 12:25 +0000
Tagging package [spacewalk-utils] version [1.8.6-1] in directory [utils/].
Changes since spacewalk-1.8.1-1:
Tomas Lestach (2):
812812 - make generated SSL certificate publicly available
Automatic commit of package [spacewalk-utils] release [1.8.6-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-hostname-rename | 5 +++++
utils/spacewalk-utils.spec | 6 +++++-
3 files changed, 11 insertions(+), 2 deletions(-)
---
12 years, 2 months