|
 |
9630d3 |
diff --git a/man/rhnplugin.conf.5 b/man/rhnplugin.conf.5
|
|
|
9630d3 |
index fa29e7c..0de8bc1 100644
|
|
|
9630d3 |
--- a/man/rhnplugin.conf.5
|
|
|
9630d3 |
+++ b/man/rhnplugin.conf.5
|
|
|
9630d3 |
@@ -37,6 +37,9 @@ Either `0' or `1'. Determines whether gpg signature checking will be performed
|
|
|
9630d3 |
on packages coming from Spacewalk/Red Hat Satellite. Default value is `1'. If this option
|
|
|
9630d3 |
is not set, the value from \fByum.conf\fP(5) will be used.
|
|
|
9630d3 |
|
|
|
9630d3 |
+.IP \fBtimeout\fR
|
|
|
9630d3 |
+The amount of time (in seconds) that you want to wait for a response before timing out. If this option is not set, the value from \fByum.conf\fP(5) will be used.
|
|
|
9630d3 |
+
|
|
|
9630d3 |
.SH FILES
|
|
|
9630d3 |
|
|
|
9630d3 |
.IP \fI/etc/yum/pluginconf.d/rhnplugin.conf\fP
|
|
|
9630d3 |
diff --git a/rhnplugin.conf b/rhnplugin.conf
|
|
|
9630d3 |
index 076aa38..4522165 100644
|
|
|
9630d3 |
--- a/rhnplugin.conf
|
|
|
9630d3 |
+++ b/rhnplugin.conf
|
|
|
9630d3 |
@@ -1,6 +1,7 @@
|
|
|
9630d3 |
[main]
|
|
|
9630d3 |
enabled = 0
|
|
|
9630d3 |
gpgcheck = 1
|
|
|
9630d3 |
+timeout = 120
|
|
|
9630d3 |
|
|
|
9630d3 |
# You can specify options per channel, e.g.:
|
|
|
9630d3 |
#
|
|
|
9630d3 |
diff --git a/rhnplugin.py b/rhnplugin.py
|
|
|
9630d3 |
index 0d3e80a..3cbd355 100644
|
|
|
9630d3 |
--- a/rhnplugin.py
|
|
|
9630d3 |
+++ b/rhnplugin.py
|
|
|
9630d3 |
@@ -66,7 +66,7 @@ def init_hook(conduit):
|
|
|
9630d3 |
RHN_DISABLED = _("Red Hat Satellite or RHN Classic support will be disabled.")
|
|
|
9630d3 |
|
|
|
9630d3 |
conduit_conf = conduit.getConf()
|
|
|
9630d3 |
- timeout = conduit_conf.timeout
|
|
|
9630d3 |
+ timeout = conduit.confFloat('main', 'timeout', conduit_conf.timeout)
|
|
|
9630d3 |
|
|
|
9630d3 |
if not os.geteuid()==0:
|
|
|
9630d3 |
# If non-root notify user Spacewalk repo not accessible
|
|
|
9630d3 |
@@ -269,7 +269,8 @@ def posttrans_hook(conduit):
|
|
|
9630d3 |
""" Post rpm transaction hook. We update the RHN profile here. """
|
|
|
9630d3 |
global rhn_enabled
|
|
|
9630d3 |
if rhn_enabled:
|
|
|
9630d3 |
- timeout = conduit.getConf().timeout
|
|
|
9630d3 |
+ timeout = conduit.confFloat('main', 'timeout',
|
|
|
9630d3 |
+ conduit.getConf().timeout)
|
|
|
9630d3 |
up2date_cfg = config.initUp2dateConfig()
|
|
|
9630d3 |
if up2date_cfg.has_key('writeChangesToLog') and up2date_cfg['writeChangesToLog'] == 1:
|
|
|
9630d3 |
ts_info = conduit.getTsInfo()
|
|
|
9630d3 |
diff --git a/yum-rhn-plugin.spec b/yum-rhn-plugin.spec
|
|
|
9630d3 |
index 54a943d..5178223 100644
|
|
|
9630d3 |
--- a/yum-rhn-plugin.spec
|
|
|
9630d3 |
+++ b/yum-rhn-plugin.spec
|
|
|
9630d3 |
@@ -1,7 +1,7 @@
|
|
|
9630d3 |
Summary: Spacewalk support for yum
|
|
|
9630d3 |
Name: yum-rhn-plugin
|
|
|
9630d3 |
Version: 2.0.1
|
|
|
9630d3 |
-Release: 1%{?dist}
|
|
|
9630d3 |
+Release: 2%{?dist}
|
|
|
9630d3 |
License: GPLv2
|
|
|
9630d3 |
Group: System Environment/Base
|
|
|
9630d3 |
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
|
|
|
9630d3 |
@@ -70,6 +70,9 @@ fi
|
|
|
9630d3 |
%doc LICENSE
|
|
|
9630d3 |
|
|
|
9630d3 |
%changelog
|
|
|
9630d3 |
+* Mon Sep 09 2013 Stephen Herr <sherr@redhat.com> 2.0.1-2
|
|
|
9630d3 |
+- Resolves: #1006045 - keep yum-rhn-plugins higher default timeout
|
|
|
9630d3 |
+
|
|
|
9630d3 |
* Wed Jul 17 2013 Tomas Kasparek <tkasparek@redhat.com> 2.0.1-1
|
|
|
9630d3 |
- Bumping package versions for 2.0.
|
|
|
9630d3 |
|