2 commits - rel-eng/packages reporting/spacewalk-report reporting/spacewalk-reports.spec
by Michael Mraka
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-report | 9 ++-------
reporting/spacewalk-reports.spec | 5 ++++-
3 files changed, 7 insertions(+), 9 deletions(-)
New commits:
commit c7de0916f0d76bbd233d489025f771338755f922
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 25 09:26:30 2010 +0100
Automatic commit of package [spacewalk-reports] release [1.3.1-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index ff304e9..0500797 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-1.2.3-1 reporting/
+1.3.1-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index 49ba132..64ba0d2 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/spacewalk-report.8*
%changelog
+* Thu Nov 25 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.1-1
+- fixed namespace of imported modules
+
* Mon Sep 20 2010 Jan Pazdziora 1.2.3-1
- 634961 - stop null/None values from being presented as "None".
commit 78028666e4cefa22dc9d03effb0b52b3dbfd0eb2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 25 09:24:51 2010 +0100
fixed namespace of imported modules
diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report
index 8b6978b..37f74ab 100755
--- a/reporting/spacewalk-report
+++ b/reporting/spacewalk-report
@@ -32,17 +32,12 @@ except KeyboardInterrupt:
systemExit(-1, "\nUser interrupted process.")
-_LIBPATH = "/usr/share/rhn"
-# add to the path if need be
-if _LIBPATH not in sys.path:
- sys.path.append(_LIBPATH)
-
sys.path.append('/usr/share/spacewalk')
import reports
try:
- from server import rhnSQL
- from common import initCFG
+ from spacewalk.server import rhnSQL
+ from spacewalk.common import initCFG
except KeyboardInterrupt:
systemExit(-1, "\nUser interrupted process.")
13 years, 5 months
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/spacewalk-remove-channel | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
New commits:
commit d4bee4ec00fc89e00dd5c74a684298ebf0e2f686
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 14:26:11 2010 +0100
added --skip-channels to spacewalk-remove-channel
this is the way how to remove all packages from the channel(s)
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 693f244..7e58ab0 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -47,6 +47,8 @@ options_table = [
help="Remove the channel packages from any other channels too (Not Recommended)"),
Option("-p", "--skip-packages", action="store_true",
help="Do not remove package metadata or packages from the filesystem (Not Recommended)"),
+ Option( "--skip-channels", action="store_true",
+ help="Remove only packages from channel not the channel itself."),
]
LOCK = None
@@ -133,7 +135,8 @@ def main():
try:
delete_channels(channels.keys(), force=options.force,
- justdb=options.justdb, skip_packages=options.skip_packages)
+ justdb=options.justdb, skip_packages=options.skip_packages,
+ skip_channels=options.skip_channels)
except:
rhnSQL.rollback()
raise
@@ -278,7 +281,7 @@ def __listChannels():
return labels, parents
-def delete_channels(channelLabels, force=0, justdb=0, skip_packages=0):
+def delete_channels(channelLabels, force=0, justdb=0, skip_packages=0, skip_channels=0):
# Get the package ids
if not channelLabels:
return
@@ -341,16 +344,20 @@ def delete_channels(channelLabels, force=0, justdb=0, skip_packages=0):
['rhnErrataFileChannel', 'channel_id'],
['rhnErrataNotificationQueue', 'channel_id'],
['rhnChannelErrata', 'channel_id'],
- ['rhnChannelFamilyMembers', 'channel_id'],
['rhnChannelPackage', 'channel_id'],
- ['rhnDistChannelMap', 'channel_id'],
['rhnRegTokenChannels', 'channel_id'],
['rhnServerProfile', 'base_channel'],
['rhnKickstartableTree', 'channel_id'],
- ['rhnReleaseChannelMap', 'channel_id'],
- ['rhnChannel', 'id'],
]
+ if not skip_channels:
+ tables.extend([
+ ['rhnChannelFamilyMembers', 'channel_id'],
+ ['rhnDistChannelMap', 'channel_id'],
+ ['rhnReleaseChannelMap', 'channel_id'],
+ ['rhnChannel', 'id'],
+ ])
+
query = "delete from %s where %s = :channel_id"
for table, field in tables:
log_debug(3, "Processing table %s" % table)
13 years, 5 months
Changes to 'refs/tags/spacewalk-java-1.3.15-1'
by Lukas Zapletal
Tag 'spacewalk-java-1.3.15-1' created by Lukas Zapletal <lzap+git(a)redhat.com> at 2010-11-24 11:26 +0000
Tagging package [spacewalk-java] version [1.3.15-1] in directory [java/].
Changes since yum-rhn-plugin-1.3.1-1:
Lukas Zapletal (2):
615026 - [Multi-Org] Grants for channel permission edits throws ISE
Automatic commit of package [spacewalk-java] release [1.3.15-1].
Tomas Lestach (1):
642226 - do not look for the VT channel in case of RHEL6 base channels
---
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 24 ++++
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 52 +++++-----
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 14 ++
java/spacewalk-java.spec | 7 +
rel-eng/packages/spacewalk-java | 2
5 files changed, 70 insertions(+), 29 deletions(-)
---
13 years, 5 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Lukas Zapletal
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 52 +++++-----
java/spacewalk-java.spec | 7 +
rel-eng/packages/spacewalk-java | 2
3 files changed, 34 insertions(+), 27 deletions(-)
New commits:
commit 936049801eee2a0cf1ac1a0ca17f5dd76b91e4c8
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Wed Nov 24 12:26:23 2010 +0100
Automatic commit of package [spacewalk-java] release [1.3.15-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4881596..f0d2e94 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.14
+Version: 1.3.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -446,6 +446,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Nov 24 2010 Lukas Zapletal 1.3.15-1
+- 615026 - [Multi-Org] Grants for channel permission edits throws ISE
+- 642226 - do not look for the VT channel in case of RHEL6 base channels
+- adding last_modified attribute to the ChannelSerializer
+
* Tue Nov 23 2010 Lukas Zapletal 1.3.14-1
- 646817 - System health indicator in "Systems" related pages not displayed
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 3a8892a..5c37dc1 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.14-1 java/
+1.3.15-1 java/
commit b19d7f3dc65f0e9760c58146923f9af36c134548
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Wed Nov 24 11:55:36 2010 +0100
615026 - [Multi-Org] Grants for channel permission edits throws ISE
Fixing NPE in edit channel action.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index 0c93062..355ce29 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -14,24 +14,6 @@
*/
package com.redhat.rhn.frontend.action.channel.manage;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.action.DynaActionForm;
-
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.common.security.PermissionException;
@@ -61,6 +43,24 @@ import com.redhat.rhn.manager.download.DownloadManager;
import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.manager.user.UserManager;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
/**
* EditChannelAction
@@ -289,16 +289,18 @@ public class EditChannelAction extends RhnAction implements Listable {
}
}
- private Channel grant(DynaActionForm form,
+ private void grant(DynaActionForm form,
ActionErrors errors,
RequestContext ctx) {
Channel c = edit(form, errors, ctx);
- // now add all of the orgs to the "rhnchanneltrust"
- Org org = ctx.getLoggedInUser().getOrg();
- Set<Org> trustedorgs = org.getTrustedOrgs();
- c.setTrustedOrgs(trustedorgs);
- ChannelFactory.save(c);
- return c;
+ // if there was no exception during the above edit
+ // add all of the orgs to the "rhnchanneltrust"
+ if (c != null) {
+ Org org = ctx.getLoggedInUser().getOrg();
+ Set<Org> trustedorgs = org.getTrustedOrgs();
+ c.setTrustedOrgs(trustedorgs);
+ ChannelFactory.save(c);
+ }
}
private Channel makePrivate(DynaActionForm form,
13 years, 5 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 24 ++++++++++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 14 +++++
2 files changed, 36 insertions(+), 2 deletions(-)
New commits:
commit d114bf889a640045e82b737daf04e539b064765b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 22 13:54:26 2010 +0100
642226 - do not look for the VT channel in case of RHEL6 base channels
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
index 5740444..1827e96 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
@@ -134,6 +134,30 @@ public class Channel extends BaseDomainHelper implements Comparable {
}
/**
+ * Returns true if this Channel is a Rhel channel.
+ * @return true if this Channel is a Rhel channel.
+ */
+ public boolean isRhelChannel() {
+ return org == null;
+ }
+
+ /**
+ * Returns true if this channel is of specified release (f.e. RHEL6)
+ * @param ver release version
+ * @return true if this channel is of specified release
+ */
+ public boolean isReleaseXChannel(Integer ver) {
+ if (getDistChannelMaps() != null) {
+ for (DistChannelMap map : getDistChannelMaps()) {
+ if (map.getRelease().contains(ver.toString())) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
* @return Returns the baseDir.
*/
public String getBaseDir() {
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 4b74050..cce17e3 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -1551,9 +1551,19 @@ public class SystemManager extends BaseManager {
User user = UserFactory.findRandomOrgAdmin(orgIn);
ValidatorResult result = new ValidatorResult();
- // If this is a Satellite, subscribe to the virt channel if possible:
+ // If this is a Satellite
if (!ConfigDefaults.get().isSpacewalk()) {
- subscribeToVirtChannel(server, user, result);
+ // just install libvirt for RHEL6 base channel
+ Channel base = server.getBaseChannel();
+ if ((base != null) &&
+ base.isRhelChannel() &&
+ base.isReleaseXChannel(6)) {
+ // do some actions for RHEL6
+ }
+ else {
+ // otherwise subscribe to the virt channel if possible
+ subscribeToVirtChannel(server, user, result);
+ }
}
// Before we start looking to subscribe to a 'tools' channel for
13 years, 5 months
Changes to 'refs/tags/yum-rhn-plugin-1.3.1-1'
by Michael Mraka
Tag 'yum-rhn-plugin-1.3.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-11-24 11:01 +0000
Tagging package [yum-rhn-plugin] version [1.3.1-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since spacewalk-proxy-installer-1.3.1-1:
Michael Mraka (1):
Automatic commit of package [yum-rhn-plugin] release [1.3.1-1].
---
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 5 months
client/rhel rel-eng/packages
by Michael Mraka
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 3c6b8be8760dc830beaf6e965e0d8170dc3e4bd7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 12:01:14 2010 +0100
Automatic commit of package [yum-rhn-plugin] release [1.3.1-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index f7d472b..28bf157 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Wed Nov 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.1-1
+- removed unused imports
+
* Mon Nov 15 2010 Jan Pazdziora 1.2.7-1
- l10n: Updates to Italian (it) translation (tombo(a)fedoraproject.org)
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index 832a5f3..e767546 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.2.7-1 client/rhel/yum-rhn-plugin/
+1.3.1-1 client/rhel/yum-rhn-plugin/
13 years, 5 months
Changes to 'refs/tags/spacewalk-proxy-installer-1.3.1-1'
by Michael Mraka
Tag 'spacewalk-proxy-installer-1.3.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-11-24 11:00 +0000
Tagging package [spacewalk-proxy-installer] version [1.3.1-1] in directory [proxy/installer/].
Changes since spacewalk-proxy-1.3.2-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-proxy-installer] release [1.3.1-1].
---
proxy/installer/spacewalk-proxy-installer.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 5 months
proxy/installer rel-eng/packages
by Michael Mraka
proxy/installer/spacewalk-proxy-installer.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7bf45d686c98c2b1b44f0e6ce81f9e2cc01056a9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 12:00:50 2010 +0100
Automatic commit of package [spacewalk-proxy-installer] release [1.3.1-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec
index 712f677..c1262c9 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer
Summary: Spacewalk Proxy Server Installer
Group: Applications/Internet
License: GPLv2
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE answers.txt
%changelog
+* Wed Nov 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.1-1
+- removed unused imports
+
* Wed Nov 10 2010 Jan Pazdziora 1.2.3-1
- remove escaping (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer
index 079f5b7..80e561e 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.2.3-1 proxy/installer/
+1.3.1-1 proxy/installer/
13 years, 5 months
Changes to 'refs/tags/spacewalk-proxy-1.3.2-1'
by Michael Mraka
Tag 'spacewalk-proxy-1.3.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-11-24 11:00 +0000
Tagging package [spacewalk-proxy] version [1.3.2-1] in directory [proxy/proxy/].
Changes since spacewalk-certs-tools-1.3.1-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-proxy] release [1.3.2-1].
---
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 5 months