Branch 'SPACEWALK-0.6' - rel-eng/packages
by Jesus M. Rodriguez
rel-eng/packages/spacewalk-repo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 45f6a2cc90ae339ed054b009ac6958beaeffb138
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Mon Aug 10 10:33:02 2009 -0400
Automatic commit of package [spacewalk-repo] release [0.6-2].
diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo
index 48d58aa..0f02f02 100644
--- a/rel-eng/packages/spacewalk-repo
+++ b/rel-eng/packages/spacewalk-repo
@@ -1 +1 @@
-0.7-1 spec-tree/spacewalk-repo/
+0.6-2 spec-tree/spacewalk-repo/
14 years, 9 months
Branch 'SPACEWALK-0.6' - spec-tree/spacewalk-repo
by Jesus M. Rodriguez
spec-tree/spacewalk-repo/spacewalk-repo.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c8973c29659ae68db81ba958dca170d1e22289a0
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Mon Aug 10 10:32:47 2009 -0400
use 0.6-2 NOT 0.7-1
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index e60f1b9..c834178 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,7 +1,7 @@
Summary: Spacewalk packages yum repository configuration.
Name: spacewalk-repo
-Version: 0.7
-Release: 1%{?dist}
+Version: 0.6
+Release: 2%{?dist}
License: GPL
Group: Development
# This src.rpm is cannonical upstream
@@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT
%config %{_sysconfdir}/yum.repos.d/spacewalk.repo
%changelog
-* Mon Aug 10 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.7-1
+* Mon Aug 10 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6-2
- redefined fedora as Fedora (jesusr(a)redhat.com)
* Thu Apr 30 2009 Jan Pazdziora 0.6-1
14 years, 9 months
Changes to 'refs/tags/spacewalk-repo-0.7-1'
by Jesus M. Rodriguez
Tag 'spacewalk-repo-0.7-1' created by jesus m. rodriguez <jesusr(a)redhat.com> at 2009-08-10 14:16 +0000
Tagging package [spacewalk-repo] version [0.7-1] in directory [spec-tree/spacewalk-repo/].
Changes since yum-rhn-plugin-0.6.2-1:
jesus m. rodriguez (2):
redefined fedora as Fedora
Automatic commit of package [spacewalk-repo] release [0.7-1].
---
rel-eng/packages/spacewalk-repo | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
14 years, 9 months
Branch 'SPACEWALK-0.6' - rel-eng/packages spec-tree/spacewalk-repo
by Jesus M. Rodriguez
rel-eng/packages/spacewalk-repo | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 0747ae7c35f42ce6b1c4030092eb7160ce0e260f
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Mon Aug 10 10:16:41 2009 -0400
Automatic commit of package [spacewalk-repo] release [0.7-1].
diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo
index 82c569f..48d58aa 100644
--- a/rel-eng/packages/spacewalk-repo
+++ b/rel-eng/packages/spacewalk-repo
@@ -1 +1 @@
-0.6-1 spec-tree/spacewalk-repo/
+0.7-1 spec-tree/spacewalk-repo/
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 47a5ee3..e60f1b9 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,6 +1,6 @@
Summary: Spacewalk packages yum repository configuration.
Name: spacewalk-repo
-Version: 0.6
+Version: 0.7
Release: 1%{?dist}
License: GPL
Group: Development
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
%config %{_sysconfdir}/yum.repos.d/spacewalk.repo
%changelog
+* Mon Aug 10 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.7-1
+- redefined fedora as Fedora (jesusr(a)redhat.com)
+
* Thu Apr 30 2009 Jan Pazdziora 0.6-1
- bump version to 0.6
14 years, 9 months
Branch 'SPACEWALK-0.6' - spec-tree/spacewalk-repo
by Jesus M. Rodriguez
spec-tree/spacewalk-repo/spacewalk-repo.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 223425aa7174d80abd8f1a86a6ff0b95ea4070b2
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Mon Aug 10 10:15:36 2009 -0400
redefined fedora as Fedora
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 223347c..47a5ee3 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -27,7 +27,7 @@ rm -rf $RPM_BUILD_ROOT
# some sane default value
%define reposubdir rhel/5Server
# redefine on fedora
-%{?fedora: %define reposubdir fedora/%{fedora}}
+%{?fedora: %define reposubdir Fedora/%{fedora}}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk.repo <<REPO
14 years, 9 months
java/code
by jdob
java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit febf23ac8a70de3168596092f0ce61669dc70824
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Sun Aug 9 15:20:08 2009 -0400
Reapplying accidentally reverted commit: "Revert "478397 - fixing issue where rhnpush would schedule a taskomatic task to regenerate needed cache and was using a query that didnt generate for all channels (even though it was deleting from all channels)""
This reverts commit b99539879ea94524505ffcfa912d2d6de7d23352.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
index c8efb65..7d94edf 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
@@ -124,7 +124,8 @@ INSERT INTO rhnServerNeededCache
(server_id, package_id, errata_id)
(SELECT DISTINCT SNV.server_id, SNV.package_id, SNV.errata_id
FROM rhnServerNeededView SNV
- WHERE SNV.channel_id = :channel_id)
+ WHERE SNV.server_id in (select SC.server_id from rhnServerChannel SC
+ where SC.channel_id = :channel_id ))
</query>
</write-mode>
14 years, 9 months
2 commits - java/code
by jdob
java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml | 3
java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java | 80 +++++-----
2 files changed, 44 insertions(+), 39 deletions(-)
New commits:
commit a609788ccd1b9b62d47a95bbbb0ff085cb48155e
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Sun Aug 9 15:17:50 2009 -0400
443500 - Made sure the call to complete the SSM async operation always takes place. Added hook to associate servers with the operation.
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
index 994d7bf..55ee1dc 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
@@ -14,40 +14,31 @@
*/
package com.redhat.rhn.frontend.events;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.log4j.Logger;
import com.redhat.rhn.common.db.datasource.DataResult;
-
import com.redhat.rhn.common.localization.LocalizationService;
-
import com.redhat.rhn.common.messaging.EventMessage;
-
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.ServerFactory;
-
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserFactory;
-
import com.redhat.rhn.frontend.dto.PackageListItem;
-
import com.redhat.rhn.manager.action.ActionManager;
-
import com.redhat.rhn.manager.ssm.SsmOperationManager;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
+import com.redhat.rhn.manager.rhnset.RhnSetDecl;
/**
* Handles removing packages from servers in the SSM.
*
* @see com.redhat.rhn.frontend.events.SsmRemovePackagesEvent
- * @version $Revision$
*/
public class SsmRemovePackagesAction extends AbstractDatabaseAction {
private static Logger log = Logger.getLogger(SsmRemovePackagesAction.class);
@@ -55,30 +46,46 @@ public class SsmRemovePackagesAction extends AbstractDatabaseAction {
/** {@inheritDoc} */
protected void doExecute(EventMessage msg) {
log.debug("Executing package removals.");
- SsmRemovePackagesEvent event = (SsmRemovePackagesEvent) msg;
- DataResult result = event.getResult();
+ SsmRemovePackagesEvent event = (SsmRemovePackagesEvent) msg;
User user = UserFactory.lookupById(event.getUserId());
- Date earliest = event.getEarliest();
LocalizationService ls = LocalizationService.getInstance();
- long operationId = SsmOperationManager.createOperation(user,
- ls.getMessage("ssm.package.remove.operationname"), null);
- int numPackages = 0;
+ String operationMessage = ls.getMessage("ssm.package.remove.operationname");
+ long operationId = SsmOperationManager.createOperation(user, operationMessage,
+ RhnSetDecl.SYSTEMS.getLabel());
+
+ try {
+ scheduleDeletes(event, user);
+ }
+ catch (Exception e) {
+ log.error("Error scheduling package deletes for event: " + event, e);
+ }
+ finally {
+ // This should stay in the finally block so the operation is
+ // not perpetually left in an in progress state
+ SsmOperationManager.completeOperation(user, operationId);
+ }
+ }
+
+ private void scheduleDeletes(SsmRemovePackagesEvent event, User user) {
+
+ DataResult result = event.getResult();
+ Date earliest = event.getEarliest();
/* 443500 - The following was changed to be able to stuff all of the package
- removals into a single action. The schedule package removal page will display
- a fine grained mapping of server to package removed (taking into account to
- only show packages that exist on the server).
+ removals into a single action. The schedule package removal page will display
+ a fine grained mapping of server to package removed (taking into account to
+ only show packages that exist on the server).
- However, there is no issue in requesting a client delete a package it doesn't
- have. So when we create the action, populate it with all packages and for
- every server to which any package removal applies. This will let us keep all
- of the removals coupled under a single scheduled action and won't cause an
- issue on the client when the scheduled removals are picked up.
+ However, there is no issue in requesting a client delete a package it doesn't
+ have. So when we create the action, populate it with all packages and for
+ every server to which any package removal applies. This will let us keep all
+ of the removals coupled under a single scheduled action and won't cause an
+ issue on the client when the scheduled removals are picked up.
- jdobies, Apr 8, 2009
- */
+ jdobies, Apr 8, 2009
+ */
// The package collection is a set to prevent duplciates when keeping a running
// total of all packages selected
@@ -97,12 +104,11 @@ public class SsmRemovePackagesAction extends AbstractDatabaseAction {
Map data = (Map) it.next();
// Load the server
- Long sid = (Long)data.get("id");
+ Long sid = (Long) data.get("id");
allServerIds.add(sid);
// Get the packages out of the elaborator
List elabList = (List) data.get("elaborator0");
- numPackages += elabList.size();
for (Iterator elabIt = elabList.iterator(); elabIt.hasNext();) {
Map elabData = (Map) elabIt.next();
commit b99539879ea94524505ffcfa912d2d6de7d23352
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Sun Aug 9 14:29:03 2009 -0400
Revert "478397 - fixing issue where rhnpush would schedule a taskomatic task to regenerate needed cache and was using a query that didnt generate for all channels (even though it was deleting from all channels)"
This reverts commit 63d1a527bb70dd4291ba16a123a4f1d2560f9535.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
index 7d94edf..c8efb65 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
@@ -124,8 +124,7 @@ INSERT INTO rhnServerNeededCache
(server_id, package_id, errata_id)
(SELECT DISTINCT SNV.server_id, SNV.package_id, SNV.errata_id
FROM rhnServerNeededView SNV
- WHERE SNV.server_id in (select SC.server_id from rhnServerChannel SC
- where SC.channel_id = :channel_id ))
+ WHERE SNV.channel_id = :channel_id)
</query>
</write-mode>
14 years, 9 months
search-server/spacewalk-doc-indexes
by John Matthews
search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec | 11 ++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit cfd1b0d896d1c86a9c2f5849b22c6ae15e86c15c
Author: John Matthews <jmatthew(a)redhat.com>
Date: Fri Aug 7 19:15:24 2009 -0400
Update doc indexes to reside in "en-US"
diff --git a/search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec b/search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec
index 9cf4314..ed77cb5 100644
--- a/search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec
+++ b/search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec
@@ -30,10 +30,10 @@ documentation/help searches
%install
rm -rf $RPM_BUILD_ROOT
-install -d -m 755 $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/indexes/docs/en
-install -d -m 755 $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/indexes/docs/en/segments
-cp -a data/crawl_www/index/* $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/indexes/docs/en
-cp -a data/crawl_www/segments/* $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/indexes/docs/en/segments
+install -d -m 755 $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/indexes/docs/en-US
+install -d -m 755 $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/indexes/docs/en-US/segments
+cp -a data/crawl_www/index/* $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/indexes/docs/en-US
+cp -a data/crawl_www/segments/* $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/indexes/docs/en-US/segments
%clean
rm -rf $RPM_BUILD_ROOT
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Aug 07 2009 John Matthews <jmatthews(a)redhat.com> 0.7.0
+- update indexes to reside in "en-US"
+
* Sat Apr 04 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6.1-1
- search requires doc-indexes, sw-doc-indexes provides doc-indexes (jesusr(a)redhat.com)
- bump Versions to 0.6.0 (jesusr(a)redhat.com)
14 years, 9 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 63d1a527bb70dd4291ba16a123a4f1d2560f9535
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Aug 7 17:19:05 2009 -0400
478397 - fixing issue where rhnpush would schedule a taskomatic task to regenerate needed cache and was using a query that didnt generate for all channels (even though it was deleting from all channels)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
index c8efb65..7d94edf 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
@@ -124,7 +124,8 @@ INSERT INTO rhnServerNeededCache
(server_id, package_id, errata_id)
(SELECT DISTINCT SNV.server_id, SNV.package_id, SNV.errata_id
FROM rhnServerNeededView SNV
- WHERE SNV.channel_id = :channel_id)
+ WHERE SNV.server_id in (select SC.server_id from rhnServerChannel SC
+ where SC.channel_id = :channel_id ))
</query>
</write-mode>
14 years, 9 months
Branch 'VADER' - java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit cfbce1140e14455b2f2a4ff74015b5136774fbb7
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Aug 7 17:03:26 2009 -0400
478397 - fixing issue where rhnpush would schedule a taskomatic task to regenerate needed cache and was using a query that didnt generate for all channels (even though it was deleting from all channels)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
index c8efb65..19b6464 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml
@@ -124,7 +124,8 @@ INSERT INTO rhnServerNeededCache
(server_id, package_id, errata_id)
(SELECT DISTINCT SNV.server_id, SNV.package_id, SNV.errata_id
FROM rhnServerNeededView SNV
- WHERE SNV.channel_id = :channel_id)
+ WHERE SNV.server_id in (select SC.server_id from rhnServerChannel SC
+ where SC.channel_id = :channel_id ))
</query>
</write-mode>
14 years, 9 months