java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 26 +++++++++++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 26 insertions(+), 2 deletions(-)
New commits:
commit 4d7f97ad59e1dc077d3227668896c1a30482fa03
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 5 17:26:55 2010 +0200
Automatic commit of package [spacewalk-java] release [1.1.10-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7d570f9..16ed398 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.1.9
+Version: 1.1.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -319,6 +319,30 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed May 05 2010 Tomas Lestach <tlestach(a)redhat.com> 1.1.10-1
+- 585901 - recursive comps search (tlestach(a)redhat.com)
+- More work on select all magic (paji(a)redhat.com)
+- 588901 - Fix listLatestUpgradablePackages API results
+ (joshua.roys(a)gtri.gatech.edu)
+- Fixed an accidental compile error that occured due to a previous commit
+ (paji(a)redhat.com)
+- Added some magic to show the system names and url instead of ids in the dups
+ page (paji(a)redhat.com)
+- added an nbsp to space the text better (paji(a)redhat.com)
+- Added a new tag attribute to filter by ip address (paji(a)redhat.com)
+- More list tag enhancements (paji(a)redhat.com)
+- Updated the list tag to deal with parent vs child filtering (paji(a)redhat.com)
+- More changes to properly handle selection javascript magic (paji(a)redhat.com)
+- Needed to add more JS magic to get selections to work (paji(a)redhat.com)
+- Quick fix to deal with a null pointer that would ve occued on a logdebg
+ (paji(a)redhat.com)
+- Added code to get checkbox grouping to work (paji(a)redhat.com)
+- Got the tree filters working (paji(a)redhat.com)
+- Fixed a checkstyle error (paji(a)redhat.com)
+- fixing RowRenderer, to do coloring more like the mockups
+ (jsherril(a)redhat.com)
+- Made the post reactivation key logic more fail safe.. (paji(a)redhat.com)
+
* Thu Apr 29 2010 Partha Aji <paji(a)redhat.com> 1.1.9-1
- Added new cobbler snippets to enable sytem reactivation on bare metal reprovisioning
(paji(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1667882..a9bf514 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.1.9-1 java/
+1.1.10-1 java/
13 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 7 +
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 19 ++++
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 44 +++++-----
3 files changed, 50 insertions(+), 20 deletions(-)
New commits:
commit 5b0da627a2788330dfd60ef04b072b4dea416d05
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 5 17:08:54 2010 +0200
585901 - recursive comps search
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index fb73c8f..ca4de55 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -1184,6 +1184,13 @@ GROUP BY C.id, C.name
</query>
</mode>
+<mode name="cloned_original_id">
+ <query params="cid">
+ SELECT original_id AS id
+ FROM rhnChannelCloned
+ WHERE id = :cid
+ </query>
+</mode>
</datasource_modes>
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index a16baee..3544c67 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -2697,6 +2697,25 @@ public class ChannelManager extends BaseManager {
}
/**
+ * Returns an id of the original channel
+ * @param channel The cloned channel
+ * @return A original channel id
+ */
+ public static Long lookupOriginalId(Channel channel) {
+ Map params = new HashMap();
+ params.put("cid", channel.getId());
+
+ SelectMode mode = ModeFactory.getMode(
+ "Channel_queries", "cloned_original_id");
+ List<Map> list = (List) mode.execute(params);
+ if (!list.isEmpty()) {
+ Map map = list.get(0);
+ return (Long) map.get("id");
+ }
+ return null;
+ }
+
+ /**
* List errata that is within a channel that needs to be resynced
* This is determined by the packages in the channel
*
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
index 5b59397..f125e73 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
@@ -18,8 +18,9 @@ import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.channel.Channel;
-import com.redhat.rhn.domain.channel.ClonedChannel;
+import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.frontend.dto.PackageDto;
+import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
import com.redhat.rhn.manager.task.TaskManager;
@@ -249,7 +250,27 @@ public class RepositoryWriter {
" seconds");
}
-
+ private String getCompsRelativeFilename(Channel channel) {
+ String relativeFilename = null;
+
+ if (channel.getComps() == null) {
+ relativeFilename = getCompsFilePath(channel);
+ }
+ else {
+ relativeFilename = channel.getComps().getRelativeFilename();
+ }
+
+ // if we didn't find anything, let's check channel's original
+ if (relativeFilename == null && channel.isCloned()) {
+ // use a hack not to use ClonedChannel and it's getOriginal() method
+ Long originalChannelId = ChannelManager.lookupOriginalId(channel);
+ Channel originalChannel = ChannelFactory.lookupById(originalChannelId);
+ return getCompsRelativeFilename(originalChannel);
+ }
+
+ return relativeFilename;
+ }
+
/**
*
* @param channel channel indo
@@ -257,18 +278,8 @@ public class RepositoryWriter {
* @return repomd index for given channel
*/
private RepomdIndexData loadCompsFile(Channel channel, String checksumAlgo) {
- String relativeFilename;
String compsMount = Config.get().getString(ConfigDefaults.MOUNT_POINT);
-
- if (channel.getComps() == null) {
- relativeFilename = getCompsFilePath(channel);
- if (relativeFilename == null) {
- return null;
- }
- }
- else {
- relativeFilename = channel.getComps().getRelativeFilename();
- }
+ String relativeFilename = getCompsRelativeFilename(channel);
File compsFile = new File(compsMount + File.separator + relativeFilename);
FileInputStream stream;
@@ -345,13 +356,6 @@ public class RepositoryWriter {
if (compsMapping.containsKey(channel.getLabel())) {
compsPath = compsMapping.get(channel.getLabel());
}
- else if (channel.isCloned()) {
- // If its a cloned channel see if we can get the comps
- // from the original channel.
- ClonedChannel clonedCh = (ClonedChannel) channel;
- Channel origChannel = clonedCh.getOriginal();
- compsPath = compsMapping.get(origChannel.getLabel());
- }
return compsPath;
}
13 years, 11 months
Changes to 'refs/tags/SputLite-0.48.13-1'
by Shannon Hughes
Tag 'SputLite-0.48.13-1' created by Shannon Hughes <shughes(a)redhat.com> at 2010-05-05 15:25 +0000
Tagging package [SputLite] version [0.48.13-1] in directory [monitoring/SputLite/].
Changes since yum-rhn-plugin-1.0.2-1:
Shannon Hughes (1):
Automatic commit of package [SputLite] release [0.48.13-1].
---
monitoring/SputLite/SputLite.spec | 5 ++++-
rel-eng/packages/SputLite | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 11 months
Branch 'SPACEWALK-1.0' - monitoring/SputLite rel-eng/packages
by Shannon Hughes
monitoring/SputLite/SputLite.spec | 5 ++++-
rel-eng/packages/SputLite | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7634458faca256d73fa34f2b8eb2e5bf23320e3d
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed May 5 11:25:32 2010 -0400
Automatic commit of package [SputLite] release [0.48.13-1].
diff --git a/monitoring/SputLite/SputLite.spec b/monitoring/SputLite/SputLite.spec
index bd2e2b4..9bf5478 100644
--- a/monitoring/SputLite/SputLite.spec
+++ b/monitoring/SputLite/SputLite.spec
@@ -5,7 +5,7 @@
%define vardir /var/lib/nocpulse
Name: SputLite
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.48.12
+Version: 0.48.13
Release: 1%{?dist}
Summary: Command queue processor (Sputnik Lite)
URL: https://fedorahosted.org/spacewalk
@@ -100,6 +100,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed May 05 2010 Shannon Hughes <shughes(a)redhat.com> 0.48.13-1
+-
+
* Wed Mar 31 2010 Miroslav Suchý <msuchy(a)redhat.com> 0.48.12-1
- do not care about sending email, transfer the worries to perl-MailTools
diff --git a/rel-eng/packages/SputLite b/rel-eng/packages/SputLite
index 9d79ac4..eedfc79 100644
--- a/rel-eng/packages/SputLite
+++ b/rel-eng/packages/SputLite
@@ -1 +1 @@
-0.48.12-1 monitoring/SputLite/
+0.48.13-1 monitoring/SputLite/
13 years, 11 months
Changes to 'refs/tags/yum-rhn-plugin-1.1.2-1'
by Justin Sherrill
Tag 'yum-rhn-plugin-1.1.2-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-05-05 13:44 +0000
Tagging package [yum-rhn-plugin] version [1.1.2-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since rhn-client-tools-1.1.4-1:
Justin Sherrill (3):
Revert "589120 - fixing error "no attribute cfg" when trying to install a package"
589120 - fixing issue with traceback from rhn_chec "no attribute cfg"
Automatic commit of package [yum-rhn-plugin] release [1.1.2-1].
---
client/rhel/rhn-client-tools/src/up2date_client/rhncli.py | 3 ---
client/rhel/yum-rhn-plugin/actions/packages.py | 4 ++--
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
---
13 years, 11 months
Changes to 'refs/tags/yum-rhn-plugin-1.0.2-1'
by Justin Sherrill
Tag 'yum-rhn-plugin-1.0.2-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-05-05 13:47 +0000
Tagging package [yum-rhn-plugin] version [1.0.2-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since rhn-client-tools-1.0.6-1:
Justin Sherrill (1):
Automatic commit of package [yum-rhn-plugin] release [1.0.2-1].
---
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years, 11 months
Changes to 'refs/tags/rhn-client-tools-1.1.6-1'
by Justin Sherrill
Tag 'rhn-client-tools-1.1.6-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-05-05 13:44 +0000
Tagging package [rhn-client-tools] version [1.1.6-1] in directory [client/rhel/rhn-client-tools/].
Changes since rhn-client-tools-1.1.5-1:
Justin Sherrill (2):
removing spec update
Automatic commit of package [rhn-client-tools] release [1.1.6-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +-----
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
---
13 years, 11 months
Changes to 'refs/tags/rhn-client-tools-1.0.6-1'
by Justin Sherrill
Tag 'rhn-client-tools-1.0.6-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-05-05 13:47 +0000
Tagging package [rhn-client-tools] version [1.0.6-1] in directory [client/rhel/rhn-client-tools/].
Changes since rhn-client-tools-1.0.5-1:
Justin Sherrill (2):
spec fix
Automatic commit of package [rhn-client-tools] release [1.0.6-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 +----
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
---
13 years, 11 months
Changes to 'refs/tags/rhn-client-tools-1.1.5-1'
by Justin Sherrill
Tag 'rhn-client-tools-1.1.5-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-05-05 13:44 +0000
Tagging package [rhn-client-tools] version [1.1.5-1] in directory [client/rhel/rhn-client-tools/].
Changes since rhn-client-tools-1.1.4-1:
Justin Sherrill (4):
Revert "589120 - fixing error "no attribute cfg" when trying to install a package"
589120 - fixing issue with traceback from rhn_chec "no attribute cfg"
Automatic commit of package [yum-rhn-plugin] release [1.1.2-1].
Automatic commit of package [rhn-client-tools] release [1.1.5-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 4 ++--
client/rhel/rhn-client-tools/src/up2date_client/rhncli.py | 3 ---
client/rhel/yum-rhn-plugin/actions/packages.py | 4 ++--
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
rel-eng/packages/yum-rhn-plugin | 2 +-
6 files changed, 11 insertions(+), 10 deletions(-)
---
13 years, 11 months
Changes to 'refs/tags/rhn-client-tools-1.0.5-1'
by Justin Sherrill
Tag 'rhn-client-tools-1.0.5-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-05-05 13:46 +0000
Tagging package [rhn-client-tools] version [1.0.5-1] in directory [client/rhel/rhn-client-tools/].
Changes since rhn-client-tools-1.0.4-1:
Justin Sherrill (1):
Automatic commit of package [rhn-client-tools] release [1.0.5-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 11 months