client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py | 2
client/rhel/yum-rhn-plugin/actions/packages.py | 10 -
monitoring/rhnmd/rhnmd.spec | 63 +++++-----
3 files changed, 38 insertions(+), 37 deletions(-)
New commits:
commit 3b8ae70e51830107790b28ce8d443c01174df250
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 13:44:58 2009 +0100
538057 - fix typo
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 70ee705..e0e3e59 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -91,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT
- make rhnmd package noarch
* Fri Apr 10 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.3.2-1
-- 494538 - remove the dependecy of rhnmd on nocpulse-common
+- 494538 - remove the dependency of rhnmd on nocpulse-common
* Tue Apr 7 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.3.1-1
- authorized_keys should be owned by nocpulse
commit 47bd3f0f7cd2f4bf3c360e5736f855e59addbd7c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 12:19:42 2009 +0100
538057 - use proper text indention. The content of tags like Name, Version, ...
usually starts at 17 characters
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index a340254..70ee705 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -4,18 +4,18 @@
%global _initddir %{_sysconfdir}/rc.d/init.d
%endif
-Summary: Red Hat Network Monitoring Daemon
-Name: rhnmd
-URL:
https://fedorahosted.org/spacewalk
-Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.3.3
-Release: 1%{?dist}
-License: GPLv2
-BuildArch: noarch
-Group: System Environment/Daemons
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: openssh-server openssh
-BuildRequires: pam-devel
+Summary: Red Hat Network Monitoring Daemon
+Name: rhnmd
+URL:
https://fedorahosted.org/spacewalk
+Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
+Version: 5.3.3
+Release: 1%{?dist}
+License: GPLv2
+BuildArch: noarch
+Group: System Environment/Daemons
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: openssh-server openssh
+BuildRequires: pam-devel
%description
rhnmd enables secure ssh-based communication between the monitoring
commit e161aa4625f34c03a202166b37c42aa6fde8eba0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 12:17:30 2009 +0100
538057 - move %preun before %clean and %files
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 39787aa..a340254 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -66,6 +66,12 @@ then
fi
/sbin/chkconfig --add rhnmd
+%preun
+if [ $1 = 0 ]; then
+ /sbin/service rhnmd stop > /dev/null 2>&1
+ /sbin/chkconfig --del rhnmd
+fi
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -80,12 +86,6 @@ rm -rf $RPM_BUILD_ROOT
%{_initddir}/rhnmd
%doc LICENSE
-%preun
-if [ $1 = 0 ]; then
- /sbin/service rhnmd stop > /dev/null 2>&1
- /sbin/chkconfig --del rhnmd
-fi
-
%changelog
* Mon Nov 2 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.3.3-1
- make rhnmd package noarch
commit 49c6f9428b6e06e1a607d9c11b8f392da4cbac08
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 12:14:56 2009 +0100
538057 - do not use wildcards
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index bfc3a87..39787aa 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -75,8 +75,8 @@ rm -rf $RPM_BUILD_ROOT
%dir %attr(-, %{np_name},%{np_name}) %{_var}/lib/%{np_name}
%dir %attr(700, %{np_name},%{np_name}) %{_var}/lib/%{np_name}/.ssh
%config(noreplace) %attr(-, %{np_name},%{np_name})
%{_var}/lib/%{np_name}/.ssh/authorized_keys
-%{_usr}/sbin/*
-%config(noreplace) %{_sysconfdir}/%{np_name}/*
+%{_usr}/sbin/rhnmd
+%config(noreplace) %{_sysconfdir}/%{np_name}/rhnmd
%{_initddir}/rhnmd
%doc LICENSE
commit 3ea22caea637e31bdb6fcf6cd097116d5526a0bd
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 12:13:05 2009 +0100
538057 - preserve timestamp of the source files
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 269bb2c..bfc3a87 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -38,10 +38,10 @@ mkdir -p $RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
mkdir -p $RPM_BUILD_ROOT%{_libdir}
ln -sf sshd $RPM_BUILD_ROOT%{_usr}/sbin/rhnmd
-install -m 0755 rhnmd-init $RPM_BUILD_ROOT%{_initddir}/rhnmd
-install -m 0644 rhnmd_config $RPM_BUILD_ROOT%{_sysconfdir}/%{np_name}/rhnmd_config
-install -m 0600 authorized_keys
$RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh/authorized_keys
-install -m 0644 rhnmd-pam_config $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/rhnmd
+install -pm 0755 rhnmd-init $RPM_BUILD_ROOT%{_initddir}/rhnmd
+install -pm 0644 rhnmd_config $RPM_BUILD_ROOT%{_sysconfdir}/%{np_name}/rhnmd_config
+install -pm 0600 authorized_keys
$RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh/authorized_keys
+install -pm 0644 rhnmd-pam_config $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/rhnmd
%pre
if [ $1 -eq 1 ] ; then
commit 2d9c46a1cf6bc58e5be8745e579e7f6b37838ccb
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 12:09:06 2009 +0100
538057 - %{_initrddir} is considered deprecated on Fedora, but still needed on RHEL
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index c760555..269bb2c 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -1,5 +1,8 @@
%global np_name nocpulse
%global identity %{_var}/lib/%{np_name}/.ssh/nocpulse-identity
+%if 0%{!?_initddir:1}
+%global _initddir %{_sysconfdir}/rc.d/init.d
+%endif
Summary: Red Hat Network Monitoring Daemon
Name: rhnmd
@@ -29,13 +32,13 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_usr}/sbin
mkdir -p $RPM_BUILD_ROOT%{_usr}/lib
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+mkdir -p $RPM_BUILD_ROOT%{_initddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{np_name}
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
mkdir -p $RPM_BUILD_ROOT%{_libdir}
ln -sf sshd $RPM_BUILD_ROOT%{_usr}/sbin/rhnmd
-install -m 0755 rhnmd-init $RPM_BUILD_ROOT%{_initrddir}/rhnmd
+install -m 0755 rhnmd-init $RPM_BUILD_ROOT%{_initddir}/rhnmd
install -m 0644 rhnmd_config $RPM_BUILD_ROOT%{_sysconfdir}/%{np_name}/rhnmd_config
install -m 0600 authorized_keys
$RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh/authorized_keys
install -m 0644 rhnmd-pam_config $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/rhnmd
@@ -74,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %attr(-, %{np_name},%{np_name})
%{_var}/lib/%{np_name}/.ssh/authorized_keys
%{_usr}/sbin/*
%config(noreplace) %{_sysconfdir}/%{np_name}/*
-%{_initrddir}/rhnmd
+%{_initddir}/rhnmd
%doc LICENSE
%preun
commit 478e8ecfdab11a27a7dce47daa48ffda599f5f3b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 11:56:02 2009 +0100
Use %global instead of %define, see
https://fedoraproject.org/wiki/PackagingDrafts/global_preferred_over_define
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index c436c16..c760555 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -1,5 +1,5 @@
-%define np_name nocpulse
-%define identity %{_var}/lib/%{np_name}/.ssh/nocpulse-identity
+%global np_name nocpulse
+%global identity %{_var}/lib/%{np_name}/.ssh/nocpulse-identity
Summary: Red Hat Network Monitoring Daemon
Name: rhnmd
commit 5dc27309565e26d9dca40563128de933c58c7054
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 10:55:51 2009 +0100
change comment to docstring
diff --git a/client/rhel/yum-rhn-plugin/actions/packages.py
b/client/rhel/yum-rhn-plugin/actions/packages.py
index 03bf139..3aeffe2 100644
--- a/client/rhel/yum-rhn-plugin/actions/packages.py
+++ b/client/rhel/yum-rhn-plugin/actions/packages.py
@@ -384,11 +384,11 @@ def _run_yum_action(command):
# The following functions are the same as the old up2date ones.
-# Check if the locally installed package list changed, if
-# needed the list is updated on the server
-# In case of error avoid pushing data to stay safe
-#
def checkNeedUpdate(rhnsd=None):
+ """ Check if the locally installed package list changed, if
+ needed the list is updated on the server
+ In case of error avoid pushing data to stay safe
+ """
data = {}
dbpath = "/var/lib/rpm"
cfg = config.initUp2dateConfig()
@@ -421,8 +421,8 @@ def checkNeedUpdate(rhnsd=None):
# from rhnsd
return refresh_list(rhnsd=1)
-# push again the list of rpm packages to the server
def refresh_list(rhnsd=None):
+ """ push again the list of rpm packages to the server
"""
log.log_debug("Called refresh_rpmlist")
ret = None
commit 1ee7a36c0f2dc84c83b490facc5778dde54dfa58
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 16 09:57:41 2009 +0100
dead code - this commented code is for long time on bottom of this file
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py
b/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py
index a4749a6..16f082b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py
@@ -18,8 +18,6 @@ class ClientCapabilities(UserDict.UserDict):
# FIXME: at some point, this will be
# intelligently populated...
localcaps = {
-# "packages.runTransaction":{'version':1,
'value':1},
-# "blippyfoo":{'version':5, 'value':0},
"caneatCheese":{'version':1, 'value': 1}
}
if capsToPopulate: