2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Dobes
java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsListSetupAction.java | 2 +-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 7810ebfd1b861d0d7bb9b1468ce325634077551a
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Jul 22 08:28:58 2013 +0200
Automatic commit of package [spacewalk-java] release [2.1.3-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 450bd4a..0a5101e 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.2
+Version: 2.1.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -771,6 +771,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Jul 22 2013 Jan Dobes 2.1.3-1
+- prevent ISE when UUID and host ID is null
+- ISS: Return LookupException to getDefaultMaster() if there isn't one
+
* Fri Jul 19 2013 Stephen Herr <sherr(a)redhat.com> 2.1.2-1
- 986335 - explicitly require libxml2 for kickstarts to avoid error
- 986299 - use empty_message_key instead of empty_message
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 6507840..8661b1e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.2-1 java/
+2.1.3-1 java/
commit f57a7a14e359cb447709bc13055c4b56568be5c0
Author: Johannes Renner <jrenner(a)suse.de>
Date: Fri Jul 19 13:39:51 2013 +0200
prevent ISE when UUID and host ID is null
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsListSetupAction.java
index 308b9db..5252234 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsListSetupAction.java
@@ -63,7 +63,7 @@ public class VirtualSystemsListSetupAction extends BaseSystemListSetupAction {
if (current.isFakeNode()) {
continue;
}
- else if (current.getUuid() == null) {
+ else if (current.getUuid() == null && current.getHostSystemId() != null) {
current.setSystemId(current.getHostSystemId());
}
else {
10 years, 10 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 5308e5f069f40449acd6f4d764389aa01f9adb36
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Fri Jul 19 09:45:55 2013 -0400
ISS: Return LookupException to getDefaultMaster() if there isn't one
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java
index d1438a1..7be457c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java
@@ -152,7 +152,9 @@ public class MasterHandler extends BaseHandler {
*/
public IssMaster getDefaultMaster(String sessionKey) {
ensureSatAdmin(getLoggedInUser(sessionKey));
- return IssFactory.getCurrentMaster();
+ IssMaster dflt = IssFactory.getCurrentMaster();
+ validateExists(dflt, "Default Master");
+ return dflt;
}
/**
10 years, 10 months
Changes to 'refs/tags/spacewalk-java-2.1.2-1'
by StephenHerr
Tag 'spacewalk-java-2.1.2-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-07-19 12:54 +0000
Tagging package [spacewalk-java] version [2.1.2-1] in directory [java/].
Changes since spacewalk-web-2.1.2-1:
Stephen Herr (2):
986335 - explicitly require libxml2 for kickstarts to avoid error
Automatic commit of package [spacewalk-java] release [2.1.2-1].
Tomas Lestach (1):
986299 - use empty_message_key instead of empty_message
---
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 2 -
java/code/webapp/WEB-INF/pages/systems/groups/add.jsp | 13 +++-------
java/spacewalk-java.spec | 6 +++-
rel-eng/packages/spacewalk-java | 2 -
4 files changed, 11 insertions(+), 12 deletions(-)
---
10 years, 10 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 2 +-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 75b3f2c0837d69b63856a65d146c90c7cc7c9473
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jul 19 08:54:08 2013 -0400
Automatic commit of package [spacewalk-java] release [2.1.2-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index bd7f2f6..450bd4a 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.1
+Version: 2.1.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -771,6 +771,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jul 19 2013 Stephen Herr <sherr(a)redhat.com> 2.1.2-1
+- 986335 - explicitly require libxml2 for kickstarts to avoid error
+- 986299 - use empty_message_key instead of empty_message
+
* Thu Jul 18 2013 Grant Gainey 2.1.1-1
- JUnit fixes
- Bumping package versions for 2.1.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 91a569a..6507840 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.1-1 java/
+2.1.2-1 java/
commit 49021dffd9d583bde743c6e82cf78567b7ff654e
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jul 19 08:53:57 2013 -0400
986335 - explicitly require libxml2 for kickstarts to avoid error
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 08c6159..18e3209 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -100,7 +100,7 @@ public class KickstartFormatter {
"# --End " + Config.get().getString("web.product_name") + " command section--" +
NEWLINE;
public static final String[] UPDATE_PKG_NAMES =
- {"pyOpenSSL", "rhnlib", "libxml2-python"};
+ {"pyOpenSSL", "rhnlib", "libxml2-python", "libxml2"};
public static final String[] FRESH_PKG_NAMES_RHEL34 =
{"up2date", "up2date-gnome"};
public static final String[] FRESH_PKG_NAMES_RHEL2 =
10 years, 10 months
java/code
by Tomas Lestach
java/code/webapp/WEB-INF/pages/systems/groups/add.jsp | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
New commits:
commit 0d1a719ad7a7e11377e1b299c86e217b8cef6a07
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 19 13:46:43 2013 +0200
986299 - use empty_message_key instead of empty_message
diff --git a/java/code/webapp/WEB-INF/pages/systems/groups/add.jsp b/java/code/webapp/WEB-INF/pages/systems/groups/add.jsp
index 5d8f57c..3391147 100644
--- a/java/code/webapp/WEB-INF/pages/systems/groups/add.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/groups/add.jsp
@@ -2,16 +2,11 @@
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<c:set var="msg"><bean:message key="systems.groups.add.jsp.noGroups"
- arg0="/rhn/systems/details/groups/ListRemove.do?sid=${param.sid}"
- /></c:set>
-<c:set var="summary_key" value="systems.groups.add.jsp.summary" />
-<c:set var="summary_arg0" value="${rhn:localize('systems.groups.jsp.add')}" />
-
<c:import url="/WEB-INF/pages/common/fragments/systems/groups.jspf">
<c:param name = "title_key" value="systems.groups.add.jsp.title"/>
- <c:param name = "summary_key" value="${summary_key}"/>
- <c:param name = "summary_arg0" value="${summary_arg0}"/>
+ <c:param name = "summary_key" value="systems.groups.add.jsp.summary"/>
+ <c:param name = "summary_arg0" value="${rhn:localize('systems.groups.jsp.add')}"/>
<c:param name = "action_key" value="systems.groups.jsp.add"/>
- <c:param name = "empty_message" value="${msg}"/>
+ <c:param name = "empty_message_key" value="systems.groups.add.jsp.noGroups"/>
+ <c:param name = "empty_message_arg0" value="/rhn/systems/details/groups/ListRemove.do?sid=${param.sid}"/>
</c:import>
10 years, 10 months
Changes to 'refs/tags/spacewalk-repo-2.0-3'
by Tomáš Kašpárek
Tag 'spacewalk-repo-2.0-3' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-07-19 11:34 +0000
Tagging package [spacewalk-repo] version [2.0-3] in directory [spec-tree/spacewalk-repo/].
Changes since spacewalk-web-2.0.3-1:
Tomas Kasparek (2):
fixing spacewalk-repo.spec
Automatic commit of package [spacewalk-repo] minor release [2.0-3].
---
rel-eng/packages/spacewalk-repo | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 10 months
Branch 'SPACEWALK-2.0' - rel-eng/packages spec-tree/spacewalk-repo
by Tomáš Kašpárek
rel-eng/packages/spacewalk-repo | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit abf4338770ebcf7df6eb73df6e2a9f5ba85aeaea
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Fri Jul 19 13:34:32 2013 +0200
Automatic commit of package [spacewalk-repo] minor release [2.0-3].
diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo
index 5f5c6bf..fd54dd9 100644
--- a/rel-eng/packages/spacewalk-repo
+++ b/rel-eng/packages/spacewalk-repo
@@ -1 +1 @@
-2.0.0-2 spec-tree/spacewalk-repo/
+2.0-3 spec-tree/spacewalk-repo/
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 20462a1..c87cc3e 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: 2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
Group: System Environment/Base
# This src.rpm is cannonical upstream
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/yum.repos.d/spacewalk-client-nightly.repo
%changelog
+* Fri Jul 19 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0-3
+- fixing spacewalk-repo.spec
+
* Wed Jul 17 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.0-2
- Bumping package versions for 2.0.
- replace legacy name of Tagger with new one
10 years, 10 months
Branch 'SPACEWALK-2.0' - spec-tree/spacewalk-repo
by Tomáš Kašpárek
spec-tree/spacewalk-repo/spacewalk-repo.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cde3c6a171f1d0fedb09e3a5462ac270586c2de9
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Fri Jul 19 13:33:58 2013 +0200
fixing spacewalk-repo.spec
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 762d8c3..20462a1 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: 2.0.0
+Version: 2.0
Release: 2%{?dist}
License: GPLv2
Group: System Environment/Base
10 years, 10 months
Changes to 'refs/tags/spacewalk-web-2.1.2-1'
by Tomas Lestach
Tag 'spacewalk-web-2.1.2-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-07-19 08:19 +0000
Tagging package [spacewalk-web] version [2.1.2-1] in directory [web/].
Changes since spacewalk-java-2.1.1-1:
Tomas Lestach (2):
726815 - parent channel cannot be a shared channel from different org when cloning
Automatic commit of package [spacewalk-web] release [2.1.2-1].
---
rel-eng/packages/spacewalk-web | 2 -
web/modules/rhn/RHN/DB/ChannelEditor.pm | 28 -------------------------
web/modules/sniglets/Sniglets/ChannelEditor.pm | 2 -
web/spacewalk-web.spec | 6 ++++-
4 files changed, 7 insertions(+), 31 deletions(-)
---
10 years, 10 months
2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Tomas Lestach
rel-eng/packages/spacewalk-web | 2 -
web/modules/rhn/RHN/DB/ChannelEditor.pm | 28 -------------------------
web/modules/sniglets/Sniglets/ChannelEditor.pm | 2 -
web/spacewalk-web.spec | 6 ++++-
4 files changed, 7 insertions(+), 31 deletions(-)
New commits:
commit 78db6d638639f4e550c419bf603fac4392cb1809
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 19 10:19:13 2013 +0200
Automatic commit of package [spacewalk-web] release [2.1.2-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index e8c42fb..ce6bd3b 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.1-1 web/
+2.1.2-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index a0c3a43..7ebf7cd 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.1
+Version: 2.1.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -272,6 +272,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Jul 19 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.2-1
+- 726815 - parent channel cannot be a shared channel from different org when
+ cloning
+
* Thu Jul 18 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.1-1
- bumping Spacewalk version to 2.1 nightly
- Bumping package versions for 2.1.
commit fb98a5145d451b70a4d3cb3e6399e0e994f00d06
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 19 10:17:38 2013 +0200
726815 - parent channel cannot be a shared channel from different org when cloning
diff --git a/web/modules/rhn/RHN/DB/ChannelEditor.pm b/web/modules/rhn/RHN/DB/ChannelEditor.pm
index 2a1f7c3..be78bef 100644
--- a/web/modules/rhn/RHN/DB/ChannelEditor.pm
+++ b/web/modules/rhn/RHN/DB/ChannelEditor.pm
@@ -144,34 +144,6 @@ EOQ
return @channels;
}
-sub channels_visible_to_org {
- my $self = shift;
- my $org_id = shift;
-
- my $dbh = RHN::DB->connect;
-
- my $query;
- my $sth;
-
- $query = <<EOQ;
-SELECT ACh.channel_name as NAME, ACh.channel_id as ID, ACh.channel_depth as DEPTH, C.org_id as CHANNEL_ORG_ID
- FROM rhnAvailableChannels ACh, rhnChannel C
- WHERE ACh.org_id = :org_id
- AND C.id = ACh.channel_id
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute_h(org_id => $org_id);
-
- my @channels;
-
- while (my $row = $sth->fetchrow_hashref) {
- push @channels, $row;
- }
-
- return @channels;
-}
-
sub add_channel_packages {
my $class = shift;
my $cid = shift;
diff --git a/web/modules/sniglets/Sniglets/ChannelEditor.pm b/web/modules/sniglets/Sniglets/ChannelEditor.pm
index 5ad8bf7..5f395f5 100644
--- a/web/modules/sniglets/Sniglets/ChannelEditor.pm
+++ b/web/modules/sniglets/Sniglets/ChannelEditor.pm
@@ -560,7 +560,7 @@ sub channel_edit_form {
}
if (exists $editable{channel_parent}) {
- my @channel_list = grep { $_->{DEPTH} == 1 } RHN::ChannelEditor->channels_visible_to_org($pxt->user->org_id);
+ my @channel_list = RHN::ChannelEditor->base_channels_visible_to_org($pxt->user->org_id);
if ($subs{channel_parent} eq '(none)') {
$subs{channel_parent} = 0;
10 years, 10 months