java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4ac2f000437efe6d6642e4f8c9bae9ebd376b4ae
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Apr 6 10:56:15 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.37-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index fb6e955..4ee6d87 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.36
+Version: 1.8.37
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Apr 06 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.37-1
+- improved performance of repomd generation
+
* Thu Apr 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.36-1
- 804810 - also making inherited virtualization entitlements work correctly in
SSM (sherr(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 924c69c..ab22b37 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.36-1 java/
+1.8.37-1 java/
12 years, 2 months
java/code
by Michael Mraka
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 18 +++++-----
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit f8c71ef4ae14db95ba3650cac3b55f1f9f153c6b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Apr 6 10:53:25 2012 +0200
improved performance of repomd generation
see https://www.redhat.com/archives/spacewalk-list/2012-April/msg00000.html
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index 3e12f3f..5348278 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -604,7 +604,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<mode name="repomdgenerator_capability_files">
<query params="channel_id">
- SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version
+ SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version
FROM rhnPackageFile pkgf, rhnPackageCapability pkgcap,
rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id
WHERE
@@ -618,7 +618,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<mode name="repomdgenerator_capability_provides">
<query params="channel_id">
- SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
+ SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageProvides pkgp, rhnPackageCapability pkgcap,
rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id
WHERE
@@ -632,7 +632,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<mode name="repomdgenerator_capability_requires">
<query params="channel_id">
- SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
+ SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageRequires pkgp, rhnPackageCapability pkgcap,
rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id
WHERE
@@ -646,7 +646,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<mode name="repomdgenerator_capability_conflicts">
<query params="channel_id">
- SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
+ SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageConflicts pkgp, rhnPackageCapability pkgcap,
rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id
WHERE
@@ -660,7 +660,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<mode name="repomdgenerator_capability_obsoletes">
<query params="channel_id">
- SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
+ SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageObsoletes pkgp, rhnPackageCapability pkgcap,
rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id
WHERE
@@ -674,7 +674,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<mode name="repomdgenerator_capability_recommends">
<query params="channel_id">
- SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
+ SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageRecommends pkgp, rhnPackageCapability pkgcap,
rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id
WHERE
@@ -688,7 +688,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<mode name="repomdgenerator_capability_suggests">
<query params="channel_id">
- SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
+ SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageSuggests pkgp, rhnPackageCapability pkgcap,
rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id
WHERE
@@ -702,7 +702,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<mode name="repomdgenerator_capability_supplements">
<query params="channel_id">
- SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
+ SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageSupplements pkgp, rhnPackageCapability pkgcap,
rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id
WHERE
@@ -716,7 +716,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<mode name="repomdgenerator_package_changelog">
<query params="channel_id">
- SELECT /*+first_rows*/ chpkg.package_id, pkglog.time, pkglog.name as author, pkglog.text
+ SELECT chpkg.package_id, pkglog.time, pkglog.name as author, pkglog.text
FROM rhnPackageChangeLog pkglog, rhnChannelPackage chpkg
WHERE
chpkg.package_id = pkglog.package_id
12 years, 2 months
Changes to 'refs/tags/spacecmd-1.8.3-1'
by StephenHerr
Tag 'spacecmd-1.8.3-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-05 18:53 +0000
Tagging package [spacecmd] version [1.8.3-1] in directory [spacecmd/].
Changes since spacewalk-java-1.8.36-1:
Stephen Herr (2):
809905 - add option to allow templating for spacecmd kickstarting
Automatic commit of package [spacecmd] release [1.8.3-1].
---
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 6 +++++-
spacecmd/src/lib/kickstart.py | 10 +++++++++-
3 files changed, 15 insertions(+), 3 deletions(-)
---
12 years, 2 months
2 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by StephenHerr
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 6 +++++-
spacecmd/src/lib/kickstart.py | 10 +++++++++-
3 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit a6f9fecf4a9a8eb5f14924d8e134f907b66e163a
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Apr 5 14:53:04 2012 -0400
Automatic commit of package [spacecmd] release [1.8.3-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index 8aee942..308f552 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-1.8.2-1 spacecmd/
+1.8.3-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index ca8a761..dbdf696 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 1.8.2
+Version: 1.8.3
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -61,6 +61,10 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Thu Apr 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.3-1
+- 809905 - add option to allow templating for spacecmd kickstarting
+ (sherr(a)redhat.com)
+
* Thu Mar 29 2012 Steven Hardy <shardy(a)redhat.com> 1.8.2-1
- spacecmd : softwarechannel_clone avoid ISE on duplicate name
(shardy(a)redhat.com)
commit b9a232dd1f79ab46e23d0654189bf4fd0009f5fb
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Apr 5 14:51:49 2012 -0400
809905 - add option to allow templating for spacecmd kickstarting
diff --git a/spacecmd/src/lib/kickstart.py b/spacecmd/src/lib/kickstart.py
index 935a23f..fb51df5 100644
--- a/spacecmd/src/lib/kickstart.py
+++ b/spacecmd/src/lib/kickstart.py
@@ -1638,6 +1638,7 @@ def do_kickstart_addscript(self, args):
options = [ Option('-p', '--profile', action='store'),
Option('-e', '--execution-time', action='store'),
Option('-c', '--chroot', action='store_true'),
+ Option('-t', '--template', action='store_true'),
Option('-i', '--interpreter', action='store'),
Option('-f', '--file', action='store') ]
@@ -1668,6 +1669,11 @@ def do_kickstart_addscript(self, args):
else:
options.chroot = True
+ if re.match('n', options.template, re.I):
+ options.template = False
+ else:
+ options.template = True
+
if re.match('pre', options.execution_time, re.I):
options.execution_time = 'pre'
else:
@@ -1698,6 +1704,7 @@ def do_kickstart_addscript(self, args):
print 'Profile Name: %s' % options.profile
print 'Execution Time: %s' % options.execution_time
print 'Chroot: %s' % options.chroot
+ print 'Template: %s' % options.template
print 'Interpreter: %s' % options.interpreter
print 'Contents:'
print options.contents
@@ -1709,7 +1716,8 @@ def do_kickstart_addscript(self, args):
options.contents,
options.interpreter,
options.execution_time,
- options.chroot)
+ options.chroot,
+ options.template)
####################
12 years, 2 months
Changes to 'refs/tags/spacewalk-java-1.8.36-1'
by StephenHerr
Tag 'spacewalk-java-1.8.36-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-05 18:07 +0000
Tagging package [spacewalk-java] version [1.8.36-1] in directory [java/].
Changes since spacewalk-setup-1.8.4-1:
Stephen Herr (2):
804810 - also making inherited virtualization entitlements work correctly in SSM
Automatic commit of package [spacewalk-java] release [1.8.36-1].
---
java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 20 ++++++++++-----
java/spacewalk-java.spec | 6 +++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 20 insertions(+), 8 deletions(-)
---
12 years, 2 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 20 ++++++++++-----
java/spacewalk-java.spec | 6 +++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 20 insertions(+), 8 deletions(-)
New commits:
commit 1b942beda1995fa3e0826fefbdb937ec78da65f8
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Apr 5 14:07:45 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.36-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index efa70e1..fb6e955 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.35
+Version: 1.8.36
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Apr 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.36-1
+- 804810 - also making inherited virtualization entitlements work correctly in
+ SSM (sherr(a)redhat.com)
+
* Thu Apr 05 2012 Jan Pazdziora 1.8.35-1
- 809897 - using the evr_t_as_vre_simple.
- adding jdom dependency (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index fd97354..924c69c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.35-1 java/
+1.8.36-1 java/
commit 23b4958b010f710dbd0bafb6e65aca89b96439bb
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Apr 5 14:07:35 2012 -0400
804810 - also making inherited virtualization entitlements work correctly in SSM
diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java
index de6e3e5..39fdd1a 100644
--- a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java
+++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java
@@ -31,6 +31,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -65,7 +66,7 @@ public class SsmManager {
* channels that are safe to subscribe it to
*/
public static Map<Long, ChannelActionDAO> verifyChildEntitlements(
- User user, Map<Long, ChannelActionDAO> sysMapping, List<Channel> allChannels) {
+ User user, Map<Long, ChannelActionDAO> sysMapping, List<Channel> allChannels) {
//Load all of the channels in a map for easy lookup
Map<Long, Channel> idToChan = new HashMap<Long, Channel>();
@@ -85,14 +86,17 @@ public class SsmManager {
// a more accurate representation of how many entitlements are left rather than
// always loading the static value from the DB.
Map<Channel, Long> channelToAvailableEntitlements =
- new HashMap<Channel, Long>(allChannels.size());
+ new HashMap<Channel, Long>(allChannels.size());
Map<Channel, Long> channelToAvailableFteEntitlements =
new HashMap<Channel, Long>(allChannels.size());
for (Server server : servers) {
Long sysid = server.getId();
- Set<Long> chanIds = sysMapping.get(sysid).getSubscribeChannelIds();
+ Set<Long> chanIds = new HashSet<Long>();
+ if (sysMapping.get(sysid) != null) {
+ chanIds = sysMapping.get(sysid).getSubscribeChannelIds();
+ }
//Use an iterator so i can remove from the set
Iterator<Long> it = chanIds.iterator();
while (it.hasNext()) {
@@ -103,7 +107,7 @@ public class SsmManager {
if (availableEntitlements == null) {
availableEntitlements =
- ChannelManager.getAvailableEntitlements(user.getOrg(), channel);
+ ChannelManager.getAvailableEntitlements(user.getOrg(), channel);
channelToAvailableEntitlements.put(channel, availableEntitlements);
}
if (availableFteEntitlements == null) {
@@ -125,7 +129,11 @@ public class SsmManager {
// First try to consume an FTE entitlement, then try regular,
// then remove the system
- if (availableFteEntitlements > 0 &&
+ if (ChannelManager
+ .isChannelFreeForSubscription(server, channel)) {
+ // do nothing, server gets this channel for free
+ }
+ else if (availableFteEntitlements > 0 &&
SystemManager.isServerFveEligible(server)) {
availableFteEntitlements -= 1;
channelToAvailableEntitlements.put(channel, availableFteEntitlements);
@@ -167,7 +175,7 @@ public class SsmManager {
* @param sysMapping a collection of ChannelActionDAOs
*/
public static void performChannelActions(User user,
- Collection<ChannelActionDAO> sysMapping) {
+ Collection<ChannelActionDAO> sysMapping) {
for (ChannelActionDAO system : sysMapping) {
for (Long cid : system.getSubscribeChannelIds()) {
12 years, 2 months
Changes to 'refs/tags/spacewalk-setup-1.8.4-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.8.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-05 14:29 +0000
Tagging package [spacewalk-setup] version [1.8.4-1] in directory [spacewalk/setup/].
Changes since spacewalk-web-1.8.8-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-setup] release [1.8.4-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 2 months
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 28a2365088c6e2d68f1218b14afa8d6ddbc8dea9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 5 16:29:39 2012 +0200
Automatic commit of package [spacewalk-setup] release [1.8.4-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 3ac4665..b3beab2 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.8.3-1 spacewalk/setup/
+1.8.4-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index d220921..07544a3 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.8.3
+Version: 1.8.4
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -106,6 +106,9 @@ rm -rf %{buildroot}
%{_mandir}/man8/spacewalk-make-mount-points*
%changelog
+* Thu Apr 05 2012 Jan Pazdziora 1.8.4-1
+- fixed clearing db for postgresql installation (michael.mraka(a)redhat.com)
+
* Mon Mar 19 2012 Jan Pazdziora 1.8.3-1
- rhn-config-satellite.pl does not like to be invoked with no --option
specified.
12 years, 2 months
Changes to 'refs/tags/spacewalk-web-1.8.8-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.8.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-05 14:29 +0000
Tagging package [spacewalk-web] version [1.8.8-1] in directory [web/].
Changes since spacewalk-backend-1.8.12-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.8.8-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 2 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4545d9674123dfaa0915ea799f29c24055da827e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 5 16:29:09 2012 +0200
Automatic commit of package [spacewalk-web] release [1.8.8-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 3d0ced7..c1b7181 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.7-1 web/
+1.8.8-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 040b08f..9115ee2 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.8.7
+Version: 1.8.8
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -254,6 +254,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Apr 05 2012 Jan Pazdziora 1.8.8-1
+- Fix naming of cloned errata to replace only the first 2 chars
+ (tlestach(a)redhat.com)
+
* Tue Apr 03 2012 Jan Pazdziora 1.8.7-1
- 806439 - Changing perl sitenav too (sherr(a)redhat.com)
12 years, 2 months