spacewalk-commits April 2013

spacewalk-commits@lists.fedorahosted.org

12 participants
275 discussions

Changes to 'refs/tags/spacewalk-utils-1.10.5-1'
by Michael Mraka 26 Apr '13

26 Apr '13

Tag 'spacewalk-utils-1.10.5-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-04-26 08:03 +0000 Tagging package [spacewalk-utils] version [1.10.5-1] in directory [utils/]. Changes since rhnsd-5.0.10-1: Michael Mraka (2): 956684 - don't print traceback on invalid date Automatic commit of package [spacewalk-utils] release [1.10.5-1]. --- rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-clone-by-date | 8 ++++++-- utils/spacewalk-utils.spec | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) ---

1 0

2 commits - rel-eng/packages utils/spacewalk-clone-by-date utils/spacewalk-utils.spec
by Michael Mraka 26 Apr '13

26 Apr '13

rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-clone-by-date | 8 ++++++-- utils/spacewalk-utils.spec | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) New commits: commit 721fad220fa14dbb5eaa68c57882787b601068f3 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Apr 26 10:03:12 2013 +0200 Automatic commit of package [spacewalk-utils] release [1.10.5-1]. diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils index 1713777..686e00f 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -1.10.4-1 utils/ +1.10.5-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index a25e20d..241e29f 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -1,7 +1,7 @@ %define rhnroot %{_prefix}/share/rhn Name: spacewalk-utils -Version: 1.10.4 +Version: 1.10.5 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server. @@ -88,6 +88,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %changelog +* Fri Apr 26 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.5-1 +- 956684 - don't print traceback on invalid date + * Mon Apr 08 2013 Stephen Herr <sherr(a)redhat.com> 1.10.4-1 - 948605 - fixing pylint error commit fe211544deb5fc92f8b34de3f2e3dad42c8068ac Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Apr 26 10:00:41 2013 +0200 956684 - don't print traceback on invalid date diff --git a/utils/spacewalk-clone-by-date b/utils/spacewalk-clone-by-date index 04776e6..dd48729 100755 --- a/utils/spacewalk-clone-by-date +++ b/utils/spacewalk-clone-by-date @@ -215,8 +215,12 @@ def parse_time(time_str): We need to use datetime, but python 2.4 does not support strptime(), so we have to parse ourselves """ if re.match('[0-9]{4}-[0-9]{2}-[0-9]{2}',time_str): - split = time_str.split("-") - return datetime.datetime(int(split[0]), int(split[1]), int(split[2])) + try: + split = time_str.split("-") + date = datetime.datetime(int(split[0]), int(split[1]), int(split[2])) + except: + raise UserError("Invalid date (%s)" % time_str) + return date else: raise UserError("Invalid date format (%s), expected YYYY-MM-DD" % time_str)

1 0

Changes to 'refs/tags/rhnsd-5.0.10-1'
by Michael Mraka 25 Apr '13

25 Apr '13

Tag 'rhnsd-5.0.10-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-04-25 16:50 +0000 Tagging package [rhnsd] version [5.0.10-1] in directory [client/rhel/rhnsd/]. Changes since osad-5.11.24-1: Michael Mraka (1): Automatic commit of package [rhnsd] release [5.0.10-1]. --- client/rhel/rhnsd/rhnsd.spec | 6 +++++- rel-eng/packages/rhnsd | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

client/rhel rel-eng/packages
by Michael Mraka 25 Apr '13

25 Apr '13

client/rhel/rhnsd/rhnsd.spec | 6 +++++- rel-eng/packages/rhnsd | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 45b54c80591341046ab7b36f271b612db6d81389 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Apr 25 18:50:10 2013 +0200 Automatic commit of package [rhnsd] release [5.0.10-1]. diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index 721372e..3732a4e 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz URL: https://fedorahosted.org/spacewalk Name: rhnsd -Version: 5.0.9 +Version: 5.0.10 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -138,6 +138,10 @@ rm -fr $RPM_BUILD_ROOT %doc LICENSE %changelog +* Thu Apr 25 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.0.10-1 +- let rhnsd.service be enabled after installation +- Purging %%changelog entries preceding Spacewalk 1.0, in active packages. + * Fri Feb 15 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 5.0.9-1 - Update .po and .pot files for rhnsd. - New translations from Transifex for rhnsd. diff --git a/rel-eng/packages/rhnsd b/rel-eng/packages/rhnsd index 1f0351f..77083ab 100644 --- a/rel-eng/packages/rhnsd +++ b/rel-eng/packages/rhnsd @@ -1 +1 @@ -5.0.9-1 client/rhel/rhnsd/ +5.0.10-1 client/rhel/rhnsd/

1 0

Changes to 'refs/tags/osad-5.11.24-1'
by Michael Mraka 25 Apr '13

25 Apr '13

Tag 'osad-5.11.24-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-04-25 16:49 +0000 Tagging package [osad] version [5.11.24-1] in directory [client/tools/osad/]. Changes since rhn-client-tools-1.10.4-1: Michael Mraka (1): Automatic commit of package [osad] release [5.11.24-1]. --- client/tools/osad/osad.spec | 5 ++++- rel-eng/packages/osad | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

client/tools rel-eng/packages
by Michael Mraka 25 Apr '13

25 Apr '13

client/tools/osad/osad.spec | 5 ++++- rel-eng/packages/osad | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit bb38968012745d26d82182a8e43d85b4c176d4b5 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Apr 25 18:49:47 2013 +0200 Automatic commit of package [osad] release [5.11.24-1]. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 19bd2d0..f10e76d 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -17,7 +17,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 5.11.23 +Version: 5.11.24 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -384,6 +384,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {} %endif %changelog +* Thu Apr 25 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.11.24-1 +- enable osad.service after installation + * Mon Apr 08 2013 Tomas Lestach <tlestach(a)redhat.com> 5.11.23-1 - setting default attributes for osa-dispatcher files diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index 9d6ee78..7c49403 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.11.23-1 client/tools/osad/ +5.11.24-1 client/tools/osad/

1 0

Changes to 'refs/tags/rhn-client-tools-1.10.4-1'
by Michael Mraka 25 Apr '13

25 Apr '13

Tag 'rhn-client-tools-1.10.4-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-04-25 16:49 +0000 Tagging package [rhn-client-tools] version [1.10.4-1] in directory [client/rhel/rhn-client-tools/]. Changes since spacewalk-java-1.10.67-1: Michael Mraka (6): let rhnsd.service be enabled after installation setup default presets for client services install preset file enable osad.service after installation macros should end properly Automatic commit of package [rhn-client-tools] release [1.10.4-1]. --- client/rhel/rhn-client-tools/50-spacewalk-client.preset | 3 ++ client/rhel/rhn-client-tools/rhn-client-tools.spec | 13 ++++++++ client/rhel/rhnsd/rhnsd.spec | 19 +++++++++++- client/tools/osad/osad.spec | 24 ++++++++++++++++ rel-eng/packages/rhn-client-tools | 2 - 5 files changed, 57 insertions(+), 4 deletions(-) ---

1 0

6 commits - client/rhel client/tools rel-eng/packages
by Michael Mraka 25 Apr '13

25 Apr '13

client/rhel/rhn-client-tools/50-spacewalk-client.preset | 3 ++ client/rhel/rhn-client-tools/rhn-client-tools.spec | 13 ++++++++ client/rhel/rhnsd/rhnsd.spec | 19 +++++++++++- client/tools/osad/osad.spec | 24 ++++++++++++++++ rel-eng/packages/rhn-client-tools | 2 - 5 files changed, 57 insertions(+), 4 deletions(-) New commits: commit b582a3e38ad27285eaa9c8db2df33e36978764b4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Apr 25 18:49:26 2013 +0200 Automatic commit of package [rhn-client-tools] release [1.10.4-1]. diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index 76ce55b..17f9b65 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 1.10.3 +Version: 1.10.4 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -347,6 +347,9 @@ make -f Makefile.rhn-client-tools test %endif %changelog +* Thu Apr 25 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.4-1 +- setup default presets for client services + * Wed Apr 03 2013 Stephen Herr <sherr(a)redhat.com> 1.10.3-1 - 947639 - Make timeout of yum-rhn-plugin calls through rhn-client-tools configurable diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index 942cbc9..58590fe 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -1.10.3-1 client/rhel/rhn-client-tools/ +1.10.4-1 client/rhel/rhn-client-tools/ commit 1c3fc5cfd38017e0a943bcb2781871004cc44ad0 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Apr 25 16:15:00 2013 +0200 macros should end properly diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index 39d2e07..721372e 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -63,9 +63,9 @@ install -m 0644 rhnsd.service $RPM_BUILD_ROOT/%{_unitdir}/ %find_lang %{name} -%{!?systemd_post: %global systemd_post() if [ $1 -eq 1 ] ; then /usr/bin/systemctl enable %%{?*} >/dev/null 2>&1 || : ; fi} -%{!?systemd_preun: %global systemd_preun() if [ $1 -eq 0 ] ; then /usr/bin/systemctl --no-reload disable %%{?*} > /dev/null 2>&1 || : ; /usr/bin/systemctl stop %%{?*} > /dev/null 2>&1 || : ; fi } -%{!?systemd_postun_with_restart: %global systemd_postun_with_restart() /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : ; if [ $1 -ge 1 ] ; then /usr/bin/systemctl try-restart %%{?*} >/dev/null 2>&1 || : ; fi } +%{!?systemd_post: %global systemd_post() if [ $1 -eq 1 ] ; then /usr/bin/systemctl enable %%{?*} >/dev/null 2>&1 || : ; fi; } +%{!?systemd_preun: %global systemd_preun() if [ $1 -eq 0 ] ; then /usr/bin/systemctl --no-reload disable %%{?*} > /dev/null 2>&1 || : ; /usr/bin/systemctl stop %%{?*} > /dev/null 2>&1 || : ; fi; } +%{!?systemd_postun_with_restart: %global systemd_postun_with_restart() /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : ; if [ $1 -ge 1 ] ; then /usr/bin/systemctl try-restart %%{?*} >/dev/null 2>&1 || : ; fi; } %if 0%{?suse_version} >= 1210 diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 28a9db4..19bd2d0 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -204,9 +204,9 @@ rm -rf $RPM_BUILD_ROOT %endif -%{!?systemd_post: %global systemd_post() if [ $1 -eq 1 ] ; then /usr/bin/systemctl enable %%{?*} >/dev/null 2>&1 || : ; fi} -%{!?systemd_preun: %global systemd_preun() if [ $1 -eq 0 ] ; then /usr/bin/systemctl --no-reload disable %%{?*} > /dev/null 2>&1 || : ; /usr/bin/systemctl stop %%{?*} >/dev/null 2>&1 || : ; fi } -%{!?systemd_postun_with_restart: %global systemd_postun_with_restart() /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : ; if [ $1 -ge 1 ] ; then /usr/bin/systemctl try-restart %%{?*} >/dev/null 2>&1 || : ; fi } +%{!?systemd_post: %global systemd_post() if [ $1 -eq 1 ] ; then /usr/bin/systemctl enable %%{?*} >/dev/null 2>&1 || : ; fi; } +%{!?systemd_preun: %global systemd_preun() if [ $1 -eq 0 ] ; then /usr/bin/systemctl --no-reload disable %%{?*} > /dev/null 2>&1 || : ; /usr/bin/systemctl stop %%{?*} >/dev/null 2>&1 || : ; fi; } +%{!?systemd_postun_with_restart: %global systemd_postun_with_restart() /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : ; if [ $1 -ge 1 ] ; then /usr/bin/systemctl try-restart %%{?*} >/dev/null 2>&1 || : ; fi; } %post commit cb1cd1508ebe8d6c97e40140989fc73f092b87bd Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Apr 25 14:56:46 2013 +0200 enable osad.service after installation diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 4debded..28a9db4 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -204,6 +204,11 @@ rm -rf $RPM_BUILD_ROOT %endif +%{!?systemd_post: %global systemd_post() if [ $1 -eq 1 ] ; then /usr/bin/systemctl enable %%{?*} >/dev/null 2>&1 || : ; fi} +%{!?systemd_preun: %global systemd_preun() if [ $1 -eq 0 ] ; then /usr/bin/systemctl --no-reload disable %%{?*} > /dev/null 2>&1 || : ; /usr/bin/systemctl stop %%{?*} >/dev/null 2>&1 || : ; fi } +%{!?systemd_postun_with_restart: %global systemd_postun_with_restart() /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : ; if [ $1 -ge 1 ] ; then /usr/bin/systemctl try-restart %%{?*} >/dev/null 2>&1 || : ; fi } + + %post %if 0%{?suse_version} >= 1210 %service_add_post osad.service @@ -211,6 +216,16 @@ rm -rf $RPM_BUILD_ROOT if [ -f %{_sysconfdir}/init.d/osad ]; then /sbin/chkconfig --add osad fi +if [ -f %{_unitdir}/osad.service ]; then + %systemd_post osad.service + if [ "$1" = "2" ]; then + # upgrade from old init.d + if [ -L /etc/rc2.d/S97osad ]; then + /usr/bin/systemctl enable osad.service >/dev/null 2>&1 + fi + rm -f /etc/rc?.d/[SK]??osad + fi +fi # Fix the /var/log/osad permission BZ 836984 if [ -f %{_var}/log/osad ]; then @@ -223,11 +238,20 @@ fi %service_del_preun osad.service %else if [ $1 = 0 ]; then + %if 0%{?fedora} + %systemd_preun osad.service + %else /sbin/service osad stop > /dev/null 2>&1 /sbin/chkconfig --del osad + %endif fi %endif +%postun +%if 0%{?fedora} +%systemd_postun_with_restart osad.service +%endif + %if 0%{?suse_version} >= 1210 %pre -n osa-dispatcher commit fc7b2f92169aa1078f8a82e4ff23b1cf222c730b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Apr 25 14:45:22 2013 +0200 install preset file diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index 6c39117..76ce55b 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -142,6 +142,10 @@ make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release} PREFIX=$ mkdir -p $RPM_BUILD_ROOT/var/lib/up2date mkdir -pm700 $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date touch $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date/loginAuth.pkl +%if 0%{?fedora} >= 18 +mkdir -p $RPM_BUILD_ROOT/%{_presetdir} +install 50-spacewalk-client.preset $RPM_BUILD_ROOT/%{_presetdir} +%endif %if 0%{?fedora} || 0%{?rhel} > 5 || 0%{?suse_version} >= 1140 rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_hal.* @@ -241,6 +245,10 @@ make -f Makefile.rhn-client-tools test #public keys and certificates %{_datadir}/rhn/RHNS-CA-CERT +%if 0%{?fedora} >= 18 +%{_presetdir}/50-spacewalk-client.preset +%endif + %files -n rhn-check %dir %{_datadir}/rhn/actions %{_mandir}/man8/rhn_check.8* commit 4512a9ca567f8cba7c1293cc5f731eaf01c60087 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Apr 25 13:47:05 2013 +0200 setup default presets for client services diff --git a/client/rhel/rhn-client-tools/50-spacewalk-client.preset b/client/rhel/rhn-client-tools/50-spacewalk-client.preset new file mode 100644 index 0000000..7015efe --- /dev/null +++ b/client/rhel/rhn-client-tools/50-spacewalk-client.preset @@ -0,0 +1,3 @@ +enable rhnsd.service +enable osad.service +enable rhn-virtualization-host.service commit a2b58a1d1dd0b78415ffe141eb3ed5d45de45ebf Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Apr 22 15:51:27 2013 +0200 let rhnsd.service be enabled after installation diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index d6221e7..39d2e07 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -63,6 +63,11 @@ install -m 0644 rhnsd.service $RPM_BUILD_ROOT/%{_unitdir}/ %find_lang %{name} +%{!?systemd_post: %global systemd_post() if [ $1 -eq 1 ] ; then /usr/bin/systemctl enable %%{?*} >/dev/null 2>&1 || : ; fi} +%{!?systemd_preun: %global systemd_preun() if [ $1 -eq 0 ] ; then /usr/bin/systemctl --no-reload disable %%{?*} > /dev/null 2>&1 || : ; /usr/bin/systemctl stop %%{?*} > /dev/null 2>&1 || : ; fi } +%{!?systemd_postun_with_restart: %global systemd_postun_with_restart() /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : ; if [ $1 -ge 1 ] ; then /usr/bin/systemctl try-restart %%{?*} >/dev/null 2>&1 || : ; fi } + + %if 0%{?suse_version} >= 1210 %pre %service_add_pre rhnsd.service @@ -75,6 +80,16 @@ install -m 0644 rhnsd.service $RPM_BUILD_ROOT/%{_unitdir}/ if [ -f /etc/init.d/rhnsd ]; then /sbin/chkconfig --add rhnsd fi +if [ -f %{_unitdir}/rhnsd.service ]; then + %systemd_post rhnsd.service + if [ "$1" = "2" ]; then + # upgrade from old init.d + if [ -L /etc/rc2.d/S97rhnsd ]; then + /usr/bin/systemctl enable rhnsd.service >/dev/null 2>&1 + fi + rm -f /etc/rc?.d/[SK]??rhnsd + fi +fi %endif %preun @@ -83,7 +98,7 @@ fi %else if [ $1 = 0 ] ; then %if 0%{?fedora} - /bin/systemctl stop rhnsd.service >/dev/null 2>&1 + %systemd_preun rhnsd.service %else service rhnsd stop >/dev/null 2>&1 %endif @@ -99,7 +114,7 @@ fi %else if [ "$1" -ge "1" ]; then %if 0%{?fedora} - /bin/systemctl condrestart rhnsd.service >/dev/null 2>&1 || : + %systemd_postun_with_restart rhnsd.service %else service rhnsd condrestart >/dev/null 2>&1 || : %endif

1 0

Changes to 'refs/tags/spacewalk-java-1.10.67-1'
by Tomas Lestach 25 Apr '13

25 Apr '13

Tag 'spacewalk-java-1.10.67-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-04-25 14:49 +0000 Tagging package [spacewalk-java] version [1.10.67-1] in directory [java/]. Changes since spacewalk-java-1.10.66-1: Jan Pazdziora (1): Stop git-untagged-commits.pl from reporting 0491921. Miroslav Suchý (2): replace legacy name of Tagger with new one replace legacy name of Tagger with new one Tomas Lestach (8): let's make RestartData serializable we need a system in SSM for ChannelManagerTest.testListCompatibleBaseChannels prevent NPE in SsmRemovePackagesAction fix ScheduleRemovePackagesActionTest fix ListTagTest do not pass server list, if Long list is expected in ActionManagerTest.testScheduleSriptRun fix bad bad debug remainder Automatic commit of package [spacewalk-java] release [1.10.67-1]. --- client/solaris/smartpm/build.py.props | 2 - java/code/src/com/redhat/rhn/common/db/datasource/RestartData.java | 3 +- java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 2 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java | 1 java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java | 10 +++++--- java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java | 4 +-- java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java | 6 ++--- java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java | 5 ++++ java/spacewalk-java.spec | 12 +++++++++- rel-eng/git-untagged-commits.pl | 2 - rel-eng/packages/spacewalk-java | 2 - rel-eng/tito.props | 2 - spec-tree/cobbler-loaders/build.py.props | 2 - spec-tree/cobbler20/build.py.props | 2 - spec-tree/cx_Oracle/build.py.props | 2 - spec-tree/dwr/build.py.props | 2 - spec-tree/heirloom-pkgtools/build.py.props | 4 --- spec-tree/jpam/build.py.props | 2 - spec-tree/mod_perl/build.py.props | 2 - spec-tree/nutch/build.py.props | 2 - spec-tree/perl-DBD-Oracle/build.py.props | 2 - spec-tree/perl-Net-INET6Glue/build.py.props | 2 - spec-tree/quartz/build.py.props | 2 - spec-tree/redstone-xmlrpc/build.py.props | 2 - spec-tree/simple-core/build.py.props | 2 - spec-tree/spacewalk-oro-compat/build.py.props | 2 - spec-tree/spacewalk-repo/build.py.props | 2 - spec-tree/stringtree-json/build.py.props | 2 - spec-tree/susestudio-java-client/build.py.props | 2 - spec-tree/tanukiwrapper/build.py.props | 2 - 30 files changed, 53 insertions(+), 36 deletions(-) ---

1 0

7 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 25 Apr '13

25 Apr '13

java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 2 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java | 1 java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java | 10 +++++--- java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java | 4 +-- java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java | 6 ++--- java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java | 5 ++++ java/spacewalk-java.spec | 12 +++++++++- rel-eng/packages/spacewalk-java | 2 - 8 files changed, 30 insertions(+), 12 deletions(-) New commits: commit cfaba775b5abe5c01f65ea6ccca9e13cb9bcd641 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 25 16:49:54 2013 +0200 Automatic commit of package [spacewalk-java] release [1.10.67-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 6953939..d8194c9 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: 1.10.66 +Version: 1.10.67 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -751,6 +751,16 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Apr 25 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.67-1 +- fix bad bad debug remainder +- do not pass server list, if Long list is expected in + ActionManagerTest.testScheduleSriptRun +- fix ListTagTest +- fix ScheduleRemovePackagesActionTest +- prevent NPE in SsmRemovePackagesAction +- we need a system in SSM for ChannelManagerTest.testListCompatibleBaseChannels +- let's make RestartData serializable + * Wed Apr 24 2013 Jan Dobes 1.10.66-1 - 952198 - added showing systems counts on cancel scheduled actions page - removing dead code diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index b13d5a4..6980528 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.10.66-1 java/ +1.10.67-1 java/ commit dc88b3d0c28d02c1c4c21ba19dfca384f5b93019 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 25 14:47:41 2013 +0200 fix bad bad debug remainder 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 7376b76..0169548 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 @@ -181,7 +181,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" JOIN rhnServerChannelArchCompat scac ON scac.server_arch_id = s.server_arch_id JOIN rhnChannel c ON c.channel_arch_id = scac.channel_arch_id WHERE c.parent_channel IS NULL - AND (c.org_id = 1 OR + AND (c.org_id = :org_id OR (C.id, C.org_id) IN (SELECT scv.id, scv.org_id commit 07d1639ac578cc354536963696e2718e49662d54 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 25 14:10:13 2013 +0200 do not pass server list, if Long list is expected in ActionManagerTest.testScheduleSriptRun diff --git a/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java b/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java index 82f5850..2ed8c1a 100644 --- a/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java @@ -542,14 +542,14 @@ public class ActionManagerTest extends RhnBaseTestCase { SystemManagerTest.giveCapability(srvr.getId(), "script.run", new Long(1)); assertNotNull(srvr); - List servers = new ArrayList(); - servers.add(srvr); + List<Long> serverIds = new ArrayList(); + serverIds.add(srvr.getId()); ScriptActionDetails sad = ActionFactory.createScriptActionDetails( "root", "root", new Long(10), "#!/bin/csh\necho hello"); assertNotNull(sad); ScriptRunAction sra = ActionManager.scheduleScriptRun( - user, servers, "Run script test", sad, new Date()); + user, serverIds, "Run script test", sad, new Date()); assertNotNull(sra); assertNotNull(sra.getId()); ScriptRunAction pa1 = (ScriptRunAction) commit 9be7ae18e525b115899a6d596c9e3eed869bc06b Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 25 13:49:12 2013 +0200 fix ListTagTest diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java index fa168b4..9408ae1 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java @@ -87,8 +87,8 @@ public class ListTagTest extends MockObjectTestCase { .withNoArguments().will(returnValue("UTF-8")); mreq.expects(atLeastOnce()).method("getAttribute") .with(eq("session")).will(returnValue(webSess)); - mwebSess.expects(atLeastOnce()).method("getUser") - .withNoArguments().will(returnValue(null)); + mwebSess.expects(atLeastOnce()).method("getWebUserId") + .withNoArguments().will(returnValue(null)); mreq.expects(atLeastOnce()).method("getParameter") .with(stringContains("list_")).will(returnValue(null)); mreq.expects(atLeastOnce()).method("setAttribute") commit 21aaa091e126df70948fdd6e59c9dd85aa1e31a2 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 25 13:33:45 2013 +0200 fix ScheduleRemovePackagesActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java index 640dc4a..f930b68 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java @@ -28,6 +28,7 @@ public class ScheduleRemovePackagesActionTest extends RhnMockStrutsTestCase { public void setUp() throws Exception { super.setUp(); setRequestPathInfo("/ssm/PackageRemoveSchedule"); + addRequestParameter("mode", "remove"); utils = new SsmActionTestUtils(user); } commit 6213fbd12fbcf2ae2d206ba5ac453a8313b9059a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 25 13:33:33 2013 +0200 prevent NPE in SsmRemovePackagesAction addressing: java.lang.NullPointerException at com.redhat.rhn.frontend.events.SsmRemovePackagesAction.doSchedule(SsmRemovePackagesAction.java:97) at com.redhat.rhn.frontend.events.SsmPackagesAction.scheduleAction(SsmPackagesAction.java:153) at com.redhat.rhn.frontend.events.SsmPackagesAction.doExecute(SsmPackagesAction.java:85) at com.redhat.rhn.frontend.events.AbstractDatabaseAction.execute(AbstractDatabaseAction.java:47) at com.redhat.rhn.common.messaging.ActionExecutor.run(ActionExecutor.java:69) at com.redhat.rhn.common.messaging.MessageDispatcher.run(MessageDispatcher.java:58) at java.lang.Thread.run(Thread.java:679) diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java index b1eebe0..c17526e 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java @@ -94,10 +94,12 @@ public class SsmRemovePackagesAction extends SsmPackagesAction { // Get the packages out of the elaborator List<Map> elabList = (List<Map>) data.get("elaborator0"); - for (Map elabMap : elabList) { - String idCombo = (String) elabMap.get("id_combo"); - PackageListItem item = PackageListItem.parse(idCombo); - allPackages.add(item); + if (elabList != null) { + for (Map elabMap : elabList) { + String idCombo = (String) elabMap.get("id_combo"); + PackageListItem item = PackageListItem.parse(idCombo); + allPackages.add(item); + } } } commit d13916400b34ed171795a852557413eff925211e Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 24 10:35:56 2013 +0200 we need a system in SSM for ChannelManagerTest.testListCompatibleBaseChannels diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java index 66ed9cb..de5efdf 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java @@ -55,6 +55,7 @@ import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; +import com.redhat.rhn.manager.ssm.SsmManager; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.testing.BaseTestCaseWithUser; import com.redhat.rhn.testing.ChannelTestUtils; @@ -731,6 +732,10 @@ public class ChannelManagerTest extends BaseTestCaseWithUser { Channel custom = ChannelTestUtils.createBaseChannel(user); custom.setOrg(user.getOrg()); + SsmManager.clearSsm(user); + SsmManager.addServersToSsm(user, new String[] {s.getId().toString()}); + ChannelFactory.commitTransaction(); + // Ask for channels compatible with the new server's base List<EssentialChannelDto> compatibles = ChannelManager.listCompatibleBaseChannelsForChannel(user, c);

1 0

← Newer
1
2
3
4
5
6
7
8
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits April 2013