Branch 'SPACEWALK-0.6' - client/rhel
by Pradeep Kilambi
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 14 +++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 6d8208d81dccda38a44ca75459652f871d50d101
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Thu Aug 20 13:47:37 2009 -0400
518336 - if hal or messagebus is not accessible log the error and proceed with rest of the registration.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index 5d7cdba..4dff5c9 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -858,10 +858,14 @@ def read_dmi():
return dmidict
def get_hal_system_and_smbios():
- computer = get_hal_computer()
-
- props = computer.GetAllProperties()
-
+ try:
+ computer = get_hal_computer()
+ props = computer.GetAllProperties()
+ except:
+ log = up2dateLog.initLog()
+ msg = "Error reading system and smbios information: %s\n" % (sys.exc_type)
+ log.log_debug(msg)
+ return
system_and_smbios = {}
for key in props:
@@ -871,8 +875,8 @@ def get_hal_system_and_smbios():
return system_and_smbios
def get_hal_smbios():
- computer = get_hal_computer()
try:
+ computer = get_hal_computer()
props = computer.GetAllProperties()
except:
log = up2dateLog.initLog()
14 years, 8 months
client/rhel
by Pradeep Kilambi
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 14 +++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit efe204ab54d995ef6edfe6afb43768506e787ad3
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Thu Aug 20 13:47:37 2009 -0400
518336 - if hal or messagebus is not accessible log the error and proceed with rest of the registration.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index 5d7cdba..4dff5c9 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -858,10 +858,14 @@ def read_dmi():
return dmidict
def get_hal_system_and_smbios():
- computer = get_hal_computer()
-
- props = computer.GetAllProperties()
-
+ try:
+ computer = get_hal_computer()
+ props = computer.GetAllProperties()
+ except:
+ log = up2dateLog.initLog()
+ msg = "Error reading system and smbios information: %s\n" % (sys.exc_type)
+ log.log_debug(msg)
+ return
system_and_smbios = {}
for key in props:
@@ -871,8 +875,8 @@ def get_hal_system_and_smbios():
return system_and_smbios
def get_hal_smbios():
- computer = get_hal_computer()
try:
+ computer = get_hal_computer()
props = computer.GetAllProperties()
except:
log = up2dateLog.initLog()
14 years, 8 months
Changes to 'refs/tags/spacewalk-java-0.7.2-1'
by Jesus M. Rodriguez
Tag 'spacewalk-java-0.7.2-1' created by jesus m. rodriguez <jesusr(a)redhat.com> at 2009-08-20 16:37 +0000
Tagging package [spacewalk-java] version [0.7.2-1] in directory [java/].
Changes since spacewalk-monitoring-0.7.1-1:
Mark Chappell (1):
Log files should be ghosted rather than belonging to a package
jesus m. rodriguez (2):
fix duplicate base channels listed in the "Parent Channel" dropdown
Automatic commit of package [spacewalk-java] release [0.7.2-1].
---
client/solaris/rhnclient/rhnclient.spec | 2 +-
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 1 +
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 7 ++++---
java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 2 +-
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 6 +++---
java/spacewalk-java.spec | 8 ++++++--
rel-eng/packages/spacewalk-java | 2 +-
8 files changed, 18 insertions(+), 12 deletions(-)
---
14 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Jesus M. Rodriguez
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit b7f4e351731d38392880315d0288dbd52ee1779a
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Thu Aug 20 12:37:59 2009 -0400
Automatic commit of package [spacewalk-java] release [0.7.2-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 36b3dfd..2f06fc4 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.1
+Version: 0.7.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ fi
%attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog
+* Thu Aug 20 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.7.2-1
+- fix duplicate base channels listed in the "Parent Channel" dropdown (jesusr(a)redhat.com)
+- Log files should be ghosted rather than belonging to a package (m.d.chappell(a)bath.ac.uk)
+
* Wed Aug 19 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.7.1-1
- add the Chat graphic as an advertisement to the layouts. (jesusr(a)redhat.com)
- allow users to chat with spacewalk members on IRC via the web.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 85fb15d..1798e21 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.1-1 java/
+0.7.2-1 java/
14 years, 8 months
java/code
by Jesus M. Rodriguez
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 1 +
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 7 ++++---
java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 2 +-
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 6 +++---
5 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 30178fd40213afb5c2932443926960fc6f6746dd
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Thu Aug 20 12:37:31 2009 -0400
fix duplicate base channels listed in the "Parent Channel" dropdown
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index a4eb296..02ea23e 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -166,6 +166,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
WHERE c.id = uc.channel_id
AND c.id = c_1_.id (+)
AND uc.org_id = :org_id
+ AND uc.user_id = :user_id
AND uc.role = 'subscribe'
AND c.parent_channel is null]]>
<return alias="c" class="com.redhat.rhn.domain.channel.Channel" />
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 661de9d..18e3ae6 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -808,12 +808,13 @@ public class ChannelFactory extends HibernateFactory {
/**
* List all accessible base channels for an org
- * @param org the org doing the searching
+ * @param user logged in user.
* @return list of custom channels
*/
- public static List<Channel> listAllBaseChannels(Org org) {
+ public static List<Channel> listAllBaseChannels(User user) {
Map params = new HashMap();
- params.put("org_id", org.getId());
+ params.put("org_id", user.getOrg().getId());
+ params.put("user_id", user.getId());
return singleton.listObjectsByNamedQuery(
"Channel.findAllBaseChannels", params);
}
diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
index fe901d9..61b5a95 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
@@ -338,7 +338,7 @@ public class ChannelFactoryTest extends RhnBaseTestCase {
// do NOT use createBaseChannel here because that will create a Red Hat
// base channel NOT a user owned base channel.
Channel base = createTestChannel(user);
- List<Channel> channels = ChannelFactory.listAllBaseChannels(user.getOrg());
+ List<Channel> channels = ChannelFactory.listAllBaseChannels(user);
List<Channel> rhbases = ChannelFactory.listRedHatBaseChannels();
int rbsize = 0;
for (Iterator itr = rhbases.iterator(); itr.hasNext();) {
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 bbf9c34..1cbe356 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
@@ -633,7 +633,7 @@ public class EditChannelAction extends RhnAction implements Listable {
// populate parent base channels
List baseChannels = new ArrayList();
List<Channel> bases = ChannelManager.findAllBaseChannelsForOrg(
- loggedInUser.getOrg());
+ loggedInUser);
LocalizationService ls = LocalizationService.getInstance();
addOption(baseChannels, ls.getMessage("generic.jsp.none"), "");
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 3b41e54..48ab715 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -2387,11 +2387,11 @@ public class ChannelManager extends BaseManager {
/**
* List base channels (including Red Hat channels) for a given org.
- * @param o Org to list base channels for.
+ * @param u User to list base channels for.
* @return List of Channels
*/
- public static List<Channel> findAllBaseChannelsForOrg(Org o) {
- return ChannelFactory.listAllBaseChannels(o);
+ public static List<Channel> findAllBaseChannelsForOrg(User u) {
+ return ChannelFactory.listAllBaseChannels(u);
}
/**
14 years, 8 months
client/solaris java/spacewalk-java.spec
by Miroslav Suchý
client/solaris/rhnclient/rhnclient.spec | 2 +-
java/spacewalk-java.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5d7d722dc09eae0c1bfcb5cb34fc24f6d0ab3a16
Author: Mark Chappell <m.d.chappell(a)bath.ac.uk>
Date: Thu Aug 20 15:28:28 2009 +0100
Log files should be ghosted rather than belonging to a package
diff --git a/client/solaris/rhnclient/rhnclient.spec b/client/solaris/rhnclient/rhnclient.spec
index 3b3afa0..4ce4cb2 100644
--- a/client/solaris/rhnclient/rhnclient.spec
+++ b/client/solaris/rhnclient/rhnclient.spec
@@ -58,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
%{shareroot}/rhn/*
/usr/sbin/*
%{rhnconf}/*
-/var/log/up2date
+%ghost /var/log/up2date
/var/run/.keep
%defattr(0744,root,sys)
/etc/init.d/rhnsd
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d8b7a99..36b3dfd 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -238,7 +238,7 @@ fi
%config(noreplace) %{_sysconfdir}/tomcat5/Catalina/localhost/rhn.xml
%{realcobsnippetsdir}/spacewalk
%attr(755, apache, root) %{_var}/satellite/systemlogs
-%attr(644, tomcat, root) %{_var}/satellite/systemlogs/audit-review.log
+%ghost %attr(644, tomcat, root) %{_var}/satellite/systemlogs/audit-review.log
%files -n spacewalk-taskomatic
%attr(755, root, root) %{_initrddir}/taskomatic
14 years, 8 months
Changes to 'refs/tags/spacewalk-monitoring-0.7.1-1'
by Miroslav Suchý
Tag 'spacewalk-monitoring-0.7.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-08-20 14:40 +0000
Tagging package [spacewalk-monitoring] version [0.7.1-1] in directory [monitoring/spacewalk-monitoring/].
Changes since spacewalk-proxy-0.7.1-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-monitoring] release [0.7.1-1].
---
monitoring/spacewalk-monitoring/spacewalk-monitoring.spec | 5 ++++-
rel-eng/packages/spacewalk-monitoring | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years, 8 months
monitoring/spacewalk-monitoring rel-eng/packages
by Miroslav Suchý
monitoring/spacewalk-monitoring/spacewalk-monitoring.spec | 5 ++++-
rel-eng/packages/spacewalk-monitoring | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6d72b56198c488c4b81e6ae347083e11fc1772aa
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 20 16:40:48 2009 +0200
Automatic commit of package [spacewalk-monitoring] release [0.7.1-1].
diff --git a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
index 47f32ec..9fda14f 100644
--- a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
+++ b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
@@ -8,7 +8,7 @@
Summary: Spacewalk monitoring
Name: spacewalk-monitoring
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
License: GPLv2
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Thu Aug 20 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.1-1
+- 516624 - allow upgrade proxy using CLI to 5.3 from 5.0
+
* Mon Jul 27 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.7-1
- Re-enable spacewalk-monitoring-selinux dependency for F11.
(dgoodwin(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-monitoring b/rel-eng/packages/spacewalk-monitoring
index 8c63bc4..1918a58 100644
--- a/rel-eng/packages/spacewalk-monitoring
+++ b/rel-eng/packages/spacewalk-monitoring
@@ -1 +1 @@
-0.6.7-1 monitoring/spacewalk-monitoring/
+0.7.1-1 monitoring/spacewalk-monitoring/
14 years, 8 months
Branch 'VADER' - 2 commits - java/code
by Devan Goodwin
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 5 +++++
java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit f23396276421f2d73bd1ebcf9ebc8443e1343105
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Wed Aug 19 12:21:55 2009 -0300
516863 - Fix Schedule page date sorting.
Was using alphabetical string sort, not an actual date sort, and based
on the string format in use you could get some wildly innacurate
results.
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf
index dd8fe3a..9c60ff5 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf
@@ -25,7 +25,7 @@
<rl:column sortable="true"
bound="false"
headerkey="actions.jsp.earliest"
- sortattr="earliest"
+ sortattr="earliestDate"
defaultsort="desc"
>
<c:out value="${current.earliest}" />
commit 5fffc51efceea19013f1d018887db3942bf4876d
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Aug 19 19:20:30 2009 -0400
518342 - adding workaround for RHEL5u4 bug failing to register when dbus and hal are not running
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 12b950a..b1f69ac 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -673,6 +673,11 @@ public class KickstartFormatter {
retval.append(KSTREE);
retval.append(NEWLINE);
+ //RHEL 5u4 hack for bz 495680
+ if (ksdata.isRhel5()) {
+ retval.append("/etc/init.d/messagebus restart" + NEWLINE);
+ retval.append("/etc/init.d/haldaemon restart" + NEWLINE);
+ }
retval.append("# begin cobbler snippet" + NEWLINE);
retval.append("$SNIPPET('redhat_register')" + NEWLINE);
retval.append("# end cobbler snippet" + NEWLINE);
14 years, 8 months
Changes to 'refs/tags/spacewalk-proxy-0.7.1-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-0.7.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-08-20 14:38 +0000
Tagging package [spacewalk-proxy] version [0.7.1-1] in directory [proxy/proxy/].
Changes since spacewalk-web-0.7.1-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-proxy] release [0.7.1-1].
---
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
14 years, 8 months