backend/rhn-conf/rhn_server.conf | 1 +
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 36fcbb123cd6f3857ad648f1422cbd9c9f10100c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 6 14:48:50 2013 +0200
Automatic commit of package [spacewalk-backend] release [2.1.6-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index b1077ff..a4ab192 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: 2.1.5
+Version: 2.1.6
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -639,6 +639,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Aug 06 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.6-1
+- set default value for disconnected
+- 959923 - change (hopefully improve) usage guide.
+
* Tue Aug 06 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.5-1
- Branding clean-up of proxy stuff in backend dir
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 38ad1cf..a632905 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.5-1 backend/
+2.1.6-1 backend/
commit a9b31040f24ee422dcac12b7f46db6bebc6c3262
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 6 14:38:43 2013 +0200
set default value for disconnected
fixing
Traceback (most recent call last):
File "/usr/bin/rhn-satellite-activate", line 42, in <module>
sys.exit(abs(mod.main() or 0))
File
"/usr/lib/python2.6/site-packages/spacewalk/satellite_tools/rhn_satellite_activate.py",
line 553, in main
options = processCommandline()
File
"/usr/lib/python2.6/site-packages/spacewalk/satellite_tools/rhn_satellite_activate.py",
line 495, in processCommandline
if CFG.DISCONNECTED and not options.disconnected:
File "/usr/lib/python2.6/site-packages/spacewalk/common/rhnConfig.py",
line 222, in __getattr__
raise AttributeError(key)
AttributeError: DISCONNECTED
diff --git a/backend/rhn-conf/rhn_server.conf b/backend/rhn-conf/rhn_server.conf
index db51476..d1b13cc 100644
--- a/backend/rhn-conf/rhn_server.conf
+++ b/backend/rhn-conf/rhn_server.conf
@@ -110,6 +110,7 @@ session_secret_4 =
# Satellite install?
satellite = 1
+disconnected = 0
# Maximum size for a config file
maximum_config_file_size = 131072