java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 32 +++++-----
1 file changed, 18 insertions(+), 14 deletions(-)
New commits:
commit 44ae2fc89e9ac27f5548d25b4d848ab3b9a31b4e
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Apr 12 11:52:24 2012 -0400
812053 - making errata.clone api not requires cloned channels
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 6da34c3..723fd0a 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
@@ -891,23 +891,27 @@ public class ErrataHandler extends BaseHandler {
throw new NoSuchChannelException();
}
- if (!channel.isCloned()) {
- throw new InvalidChannelException("Cloned channel expected: " +
+ //if calling cloneAsOriginal, do additional checks to verify a clone
+ if(inheritAllPackages){
+ if (!channel.isCloned()) {
+ throw new InvalidChannelException("Cloned channel expected: " +
channel.getLabel());
- }
-
- Channel original = ChannelFactory.lookupOriginalChannel(channel);
+ }
- if (original == null) {
- throw new InvalidChannelException("Cannot access original " +
- "of the channel: " + channel.getLabel());
+ Channel original = ChannelFactory.lookupOriginalChannel(channel);
+
+ if (original == null) {
+ throw new InvalidChannelException("Cannot access original " +
+ "of the channel: " + channel.getLabel());
+ }
+ // check access to the original
+ if (ChannelFactory.lookupByIdAndUser(original.getId(), loggedInUser) == null) {
+ throw new LookupException("User " + loggedInUser.getLogin() +
+ " does not have access to channel " + original.getLabel());
+ }
+
}
- // check access to the original
- if (ChannelFactory.lookupByIdAndUser(original.getId(), loggedInUser) == null) {
- throw new LookupException("User " + loggedInUser.getLogin() +
- " does not have access to channel " + original.getLabel());
- }
if (!UserManager.verifyChannelAdmin(loggedInUser, channel)) {
throw new PermissionCheckFailureException();
@@ -943,7 +947,7 @@ public class ErrataHandler extends BaseHandler {
//Now publish them all to the channel in a single shot
List<Errata> published = ErrataFactory.publishToChannel(errataToPublish, channel,
- loggedInUser, true);
+ loggedInUser, inheritAllPackages);
for (Errata e : published) {
ErrataFactory.save(e);
}
12 years, 1 month
Changes to 'refs/tags/spacewalk-web-1.8.9-1'
by StephenHerr
Tag 'spacewalk-web-1.8.9-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-12 15:18 +0000
Tagging package [spacewalk-web] version [1.8.9-1] in directory [web/].
Changes since spacewalk-java-1.8.42-1:
Milan Zazrivec (3):
811470 - fix documentation for ChannelSerializer
811470 - make the documentation for createOrUpdateSymlink more clear
811470 - fix documentation for getRepoSyncCronExpression API
Stephen Herr (2):
812031 - Update perl channel-select-dropdowns to use the same hierarchical sort as java pages
Automatic commit of package [spacewalk-web] release [1.8.9-1].
Tomas Lestach (1):
replace \r\n with \n for CustomDataValues
---
java/code/src/com/redhat/rhn/domain/server/CustomDataValue.java | 3
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 6 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 3
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java | 10 +
rel-eng/packages/spacewalk-web | 2
web/modules/rhn/RHN/DB/ChannelEditor.pm | 58 ++++++++++
web/modules/sniglets/Sniglets/ChannelEditor.pm | 51 +++++---
web/spacewalk-web.spec | 6 -
8 files changed, 110 insertions(+), 29 deletions(-)
---
12 years, 1 month
2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by StephenHerr
rel-eng/packages/spacewalk-web | 2
web/modules/rhn/RHN/DB/ChannelEditor.pm | 58 +++++++++++++++++++++++++
web/modules/sniglets/Sniglets/ChannelEditor.pm | 51 +++++++++++++--------
web/spacewalk-web.spec | 6 ++
4 files changed, 95 insertions(+), 22 deletions(-)
New commits:
commit d633fc581799a5ec1950cbc398d07edc6d81e61a
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Apr 12 11:18:45 2012 -0400
Automatic commit of package [spacewalk-web] release [1.8.9-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index c1b7181..a29e1ae 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.8-1 web/
+1.8.9-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 9115ee2..e55d6a4 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.8
+Version: 1.8.9
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 12 2012 Stephen Herr <sherr(a)redhat.com> 1.8.9-1
+- 812031 - Update perl channel-select-dropdowns to use the same hierarchical
+ sort as java pages (sherr(a)redhat.com)
+
* 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)
commit 893bc22592af1a354037335f9bc2559f09d1056a
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Apr 12 11:18:32 2012 -0400
812031 - Update perl channel-select-dropdowns to use the same hierarchical sort as java pages
diff --git a/web/modules/rhn/RHN/DB/ChannelEditor.pm b/web/modules/rhn/RHN/DB/ChannelEditor.pm
index 223c799..564e75e 100644
--- a/web/modules/rhn/RHN/DB/ChannelEditor.pm
+++ b/web/modules/rhn/RHN/DB/ChannelEditor.pm
@@ -146,6 +146,64 @@ EOQ
return @channels;
}
+sub base_channels_visible_to_org {
+ my $self = shift;
+ my $org_id = shift;
+
+ my $dbh = RHN::DB->connect;
+
+ my $query;
+ my $sth;
+
+ $query = <<EOQ;
+SELECT NAME, ID
+ FROM rhnChannel
+ WHERE (org_id = :org_id OR org_id is NULL)
+ AND parent_channel is NULL
+ ORDER BY name
+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 child_channels_visible_to_org_from_base {
+ my $self = shift;
+ my $org_id = shift;
+ my $base_channel_id = shift;
+
+ my $dbh = RHN::DB->connect;
+
+ my $query;
+ my $sth;
+
+ $query = <<EOQ;
+SELECT NAME, ID
+ FROM rhnChannel
+ WHERE (org_id = :org_id OR org_id is NULL)
+ AND parent_channel = :parent_channel
+ ORDER BY name
+EOQ
+
+ $sth = $dbh->prepare($query);
+ $sth->execute_h(org_id => $org_id, parent_channel => $base_channel_id);
+
+ my @channels;
+
+ while (my $row = $sth->fetchrow_hashref) {
+ push @channels, $row;
+ }
+
+ return @channels;
+}
sub channels_visible_to_org {
my $self = shift;
diff --git a/web/modules/sniglets/Sniglets/ChannelEditor.pm b/web/modules/sniglets/Sniglets/ChannelEditor.pm
index 912c194..8b0e9b7 100644
--- a/web/modules/sniglets/Sniglets/ChannelEditor.pm
+++ b/web/modules/sniglets/Sniglets/ChannelEditor.pm
@@ -350,11 +350,31 @@ sub clone_channel_form {
return $html;
}
+sub populate_channel_list {
+ my $org_id = shift;
+
+ my @channel_list = ();
+ my @base_channel_list = RHN::ChannelEditor->base_channels_visible_to_org($org_id);
+ foreach my $base (@base_channel_list) {
+ push (@channel_list, { NAME => $base->{NAME},
+ ID => $base->{ID},
+ DEPTH => 1});
+ my @child_channel_list = RHN::ChannelEditor->child_channels_visible_to_org_from_base($org_id, $base->{ID});
+ foreach my $child (@child_channel_list) {
+ push (@channel_list, { NAME => $child->{NAME},
+ ID => $child->{ID},
+ DEPTH => 2});
+ }
+ }
+
+ return @channel_list
+}
+
sub build_clone_channel_details_form {
my $pxt = shift;
my %attr = @_;
- my @channel_list = RHN::ChannelEditor->channels_visible_to_org_with_parent($pxt->user->org_id);
+ my @channel_list = populate_channel_list($pxt->user->org_id);
my $ds = new RHN::DataSource::Channel(-mode => 'user_subscribe_perms');
my $subscribable = $ds->execute_query(-u_id => $pxt->user->id, -org_id => $pxt->user->org_id);
@@ -373,17 +393,7 @@ sub build_clone_channel_details_form {
my $channel_selectbox = new RHN::Form::Widget::Select(name => 'Clone From',
label => 'clone_from');
- my @my_channels = grep {$_->{CHANNEL_ORG_ID} and $_->{CHANNEL_ORG_ID} == $pxt->user->org_id} @channel_list;
-## my @other_channels = grep { not ($_->{CHANNEL_ORG_ID} and $_->{CHANNEL_ORG_ID} == $pxt->user->org_id) } @channel_list;
- ##bugzilla
- my @other_channels = grep { not ($_->{CHANNEL_ORG_ID}) } @channel_list;
-
- my @options = ( { NAME => 'My Channels', ID => 'my_channels', DEPTH => 1, OPTGROUP => 1 },
- @my_channels,
- { NAME => 'Other Channels', ID => 'other_channels', DEPTH => 1, OPTGROUP => 1 },
- @other_channels);
-
- foreach my $opt (@options) {
+ foreach my $opt (@channel_list) {
$channel_selectbox->add_option( {value => $opt->{ID},
label => ( $opt->{DEPTH} == 1
? $opt->{NAME}
@@ -649,16 +659,17 @@ sub channel_select_options {
@rh_channels);
}
elsif ($mode eq 'compare_channels') {
- my @org_channels = RHN::Channel->channels_owned_by_org($pxt->user->org_id);
- my @rh_channels = RHN::Channel->channels_owned_by_org('NULL');
+ my @additional_channels_hash = populate_channel_list($pxt->user->org_id);
+ my @additional_channels = ();
+ foreach my $tmp_channel (@additional_channels_hash) {
+ push (@additional_channels, [$tmp_channel->{DEPTH} == 1 ?
+ $tmp_channel->{NAME} : '  ' . $tmp_channel->{NAME},
+ 'channel_' . $tmp_channel->{ID}]);
+ }
- @org_channels = grep { $perm_map{$_->[1]} } @org_channels;
- @rh_channels = grep { $perm_map{$_->[1]} } @rh_channels;
+ @additional_channels = grep { $perm_map{$_->[1]} } @additional_channels;
- push @channel_list, ([ 'My Channels', 'my_channels', 'optgroup' ],
- @org_channels,
- [ 'Red Hat Channels', 'redhat_channels', 'optgroup' ],
- @rh_channels);
+ push @channel_list, (@additional_channels);
}
elsif ($mode eq 'errata_manager') {
@channel_list = ([ 'All managed packages', 'any_channel' ]);
12 years, 1 month
3 commits - java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 6 +++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 3 ++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java | 10 ++++++++--
3 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit a5673cad3ee2c5c3da3a70ace1f10065260f4bc4
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Apr 12 12:30:18 2012 +0200
811470 - fix documentation for getRepoSyncCronExpression API
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index 96e61d3..e66afd5 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -2700,15 +2700,15 @@ public class ChannelSoftwareHandler extends BaseHandler {
}
/**
- * Returns repo synchronization cron expression
+ * Returns repo synchronization quartz expression
* @param sessionKey session key
* @param channelLabel channel label
- * @return cron expression
+ * @return quartz expression
*
* @xmlrpc.doc Returns repo synchronization cron expression
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "channelLabel", "channel label")
- * @xmlrpc.returntype string cron expression
+ * @xmlrpc.returntype string quartz expression
*/
public String getRepoSyncCronExpression(String sessionKey, String channelLabel) {
User loggedInUser = getLoggedInUser(sessionKey);
commit 8cbbe969cffedb92c2c7d9388b1468b5aa0fd382
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Apr 12 12:21:35 2012 +0200
811470 - make the documentation for createOrUpdateSymlink more clear
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
index 4be7f89..a435ee4 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
@@ -458,7 +458,8 @@ public class ConfigChannelHandler extends BaseHandler {
* #prop_desc("string","target_path",
* "The target path for the symbolic link")
* #prop_desc("string", "selinux_ctx", "SELinux Security context (optional)")
- * #prop_desc("int", "revision", "next revision number, auto increment for null")
+ * #prop_desc("int", "revision", "next revision number,
+ * skip this field for automatic revision number assignment")
* #struct_end()
* @xmlrpc.returntype
* $ConfigRevisionSerializer
commit 885faab1b66a1da6d112326dfe360e897c11f611
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Apr 12 11:46:02 2012 +0200
811470 - fix documentation for ChannelSerializer
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
index 860d9cc..d4fdcaf 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
@@ -53,12 +53,18 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
* #prop("string", "gpg_key_url")
* #prop("string", "gpg_key_id")
* #prop("string", "gpg_key_fp")
- * #prop("string", "yumrepo_source_url")
- * #prop("string", "yumrepo_label")
* #prop("dateTime.iso8601", "yumrepo_last_sync")
* #prop("string", "end_of_life")
* #prop("string", "parent_channel_label")
* #prop("string", "clone_original")
+ * #array()
+ * #struct("contentSources")
+ * #prop("int", "id")
+ * #prop("string", "label")
+ * #prop("string", "sourceUrl")
+ * #prop("string", "type")
+ * #struct_end()
+ * #array_end()
* #struct_end()
*
*/
12 years, 1 month
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/server/CustomDataValue.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a8784398061e90f3477bc06151c0b4bb153d85fe
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Apr 12 11:51:41 2012 +0200
replace \r\n with \n for CustomDataValues
textarea returns \r\n as line breaks
diff --git a/java/code/src/com/redhat/rhn/domain/server/CustomDataValue.java b/java/code/src/com/redhat/rhn/domain/server/CustomDataValue.java
index a2022ce..f4ed7b8 100644
--- a/java/code/src/com/redhat/rhn/domain/server/CustomDataValue.java
+++ b/java/code/src/com/redhat/rhn/domain/server/CustomDataValue.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.domain.server;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.action.server.ServerAction;
import com.redhat.rhn.domain.org.CustomDataKey;
import com.redhat.rhn.domain.user.User;
@@ -120,7 +121,7 @@ public class CustomDataValue implements Serializable {
* @param valueIn The value to set.
*/
public void setValue(String valueIn) {
- this.value = valueIn;
+ this.value = StringUtil.webToLinux(valueIn);
}
/**
12 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.8.42-1'
by StephenHerr
Tag 'spacewalk-java-1.8.42-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-11 15:55 +0000
Tagging package [spacewalk-java] version [1.8.42-1] in directory [java/].
Changes since spacewalk-backend-1.8.14-1:
Stephen Herr (2):
698940 - Activation Key does not have to have a base channel to add Child Channels
Automatic commit of package [spacewalk-java] release [1.8.42-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 7 -------
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 9 deletions(-)
---
12 years, 1 month
java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 863c1d320170e75733fc8c054bd14576ed2e31c7
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Apr 11 11:55:52 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.42-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 39d32cc..c6e2a57 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.41
+Version: 1.8.42
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
+* Wed Apr 11 2012 Stephen Herr <sherr(a)redhat.com> 1.8.42-1
+- 698940 - Activation Key does not have to have a base channel to add Child
+ Channels (sherr(a)redhat.com)
+
* Wed Apr 11 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.41-1
- adding javadoc to public RhnPostMockStrutsTestCase method
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 87f21ca..270a203 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.41-1 java/
+1.8.42-1 java/
12 years, 1 month
java/code
by StephenHerr
java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 7 -------
1 file changed, 7 deletions(-)
New commits:
commit 68f49fcff44f00c90ed0bb7639e4a93e656f37ef
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Apr 11 11:23:37 2012 -0400
698940 - Activation Key does not have to have a base channel to add Child Channels
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
index 93eb3e1..e8ef194 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
@@ -480,13 +480,6 @@ public class ActivationKeyHandler extends BaseHandler {
" is not a child channel.");
}
- // Verify we have access to the child's parent channel:
- Channel parentChannel = childChannel.getParentChannel();
- if (!activationKey.getChannels().contains(parentChannel)) {
- throw new InvalidChannelException("Key has not been assigned base " +
- "channel for " + childChannel.getName());
- }
-
manager.addChannel(activationKey, childChannel);
}
12 years, 1 month
Changes to 'refs/tags/spacewalk-backend-1.8.14-1'
by StephenHerr
Tag 'spacewalk-backend-1.8.14-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-11 13:52 +0000
Tagging package [spacewalk-backend] version [1.8.14-1] in directory [backend/].
Changes since spacewalk-java-1.8.41-1:
Stephen Herr (2):
786705 - Update config default to preserve base channel on reactivation
Automatic commit of package [spacewalk-backend] release [1.8.14-1].
---
backend/rhn-conf/rhn_server.conf | 2 +-
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
12 years, 1 month
2 commits - backend/rhn-conf backend/spacewalk-backend.spec rel-eng/packages
by StephenHerr
backend/rhn-conf/rhn_server.conf | 2 +-
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 6ac346f4068e3110491999749ebef800eb862ce5
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Apr 11 09:52:47 2012 -0400
Automatic commit of package [spacewalk-backend] release [1.8.14-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 62b82a5..f5148dd 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.13
+Version: 1.8.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -688,6 +688,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Apr 11 2012 Stephen Herr <sherr(a)redhat.com> 1.8.14-1
+- 786705 - Update config default to preserve base channel on reactivation
+ (sherr(a)redhat.com)
+
* Tue Apr 10 2012 Jan Pazdziora 1.8.13-1
- rhn-schema-stats: update manual page (mzazrivec(a)redhat.com)
- rhn-schema-stats: support for PostgreSQL (mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 68d47e4..4212cf3 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.13-1 backend/
+1.8.14-1 backend/
commit af0c6d7a1697c6d21cff41d64c5b6f2bd73aceb0
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Apr 11 09:52:12 2012 -0400
786705 - Update config default to preserve base channel on reactivation
diff --git a/backend/rhn-conf/rhn_server.conf b/backend/rhn-conf/rhn_server.conf
index 86fa72c..bfb599a 100644
--- a/backend/rhn-conf/rhn_server.conf
+++ b/backend/rhn-conf/rhn_server.conf
@@ -126,7 +126,7 @@ jabber_server =
# base channel reset by default.
# set to '0' if base channel needs to be preserved
-reset_base_channel = 1
+reset_base_channel = 0
# location relative to mount point for yum repomd files
repomd_path_prefix = rhn/repodata
12 years, 1 month