backend/satellite_tools/reposync.py | 1 +
backend/spacewalk-backend.spec | 5 ++++-
proxy/installer/configure-proxy.sh | 8 ++++++--
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 9d8da5d6198d0d2174163754df127d7cdd6848f5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 21 14:05:09 2013 +0100
Automatic commit of package [spacewalk-backend] release [1.9.33-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 02c078f..af48107 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.9.32
+Version: 1.9.33
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Feb 21 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.33-1
+- don't link packages which failed to download
+
* Wed Feb 20 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.32-1
- correct size for old rpms > 2 GiB
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 133cf9b..696371c 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.32-1 backend/
+1.9.33-1 backend/
commit 96a648659c3c9d3042503069916cd271defcea55
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 21 14:02:25 2013 +0100
don't link packages which failed to download
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index fe7bc6b..1d6b2fa 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -445,6 +445,7 @@ class RepoSync(object):
finally_remove(localpath)
if self.fail:
raise
+ to_process[index] = (pack, False, False)
continue
self.print_msg("Linking packages to channel.")
commit 00213980bc4005c6bd526dcec0c2a6e1253b06b3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 20 16:51:30 2013 +0100
made proxy installer systemd ready
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index bdfe3c3..7166878 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -560,8 +560,12 @@ if [ $ENABLE_SCOUT -ne 0 ]; then
MonitoringScout="MonitoringScout"
fi
for service in squid httpd jabberd $MonitoringScout; do
- /sbin/chkconfig --add $service
- /sbin/chkconfig --level 345 $service on
+ if [ -x /usr/bin/systemctl ] ; then
+ /usr/bin/systemctl enable $service
+ else
+ /sbin/chkconfig --add $service
+ /sbin/chkconfig --level 345 $service on
+ fi
done
# default is 1