client/rhel/rhn-client-tools/rhn-client-tools.spec | 9 ++++++
client/rhel/rhn-client-tools/src/firstboot/rhn_activate_gui.py | 2 +
client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 1
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 15 ++++++++--
4 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit e1cf5266ae19717afe714a8b30ad2f1202132173
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Mon Aug 3 14:58:51 2009 -0400
client tools merge from svn
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index bdab38e..0486907 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -204,6 +204,12 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/rhn_register.desktop
%changelog
+* Wed Jul 29 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.4.20-9
+- Resolves: #445881
+
+* Mon Jun 29 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.4.20-8
+- Resolves: #467866
+
* Fri Jun 26 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.6.1-1
- code cleanup - there is no usage of md5 in this code
- bump up version to 0.6
@@ -224,6 +230,9 @@ rm -rf $RPM_BUILD_ROOT
- Send smbios data to remaining_subscriptions during registration
(jbowes(a)redhat.com)
+* Fri Jun 12 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.4.20-7
+- Resolves: #504292 #467866
+
* Fri Jun 5 2009 Pradeep Kilambi <pkilambi(a)redhat.com>
- Resolves: #504296
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_activate_gui.py
b/client/rhel/rhn-client-tools/src/firstboot/rhn_activate_gui.py
index c58ab72..8e8f8e2 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_activate_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_activate_gui.py
@@ -55,6 +55,8 @@ class RhnActivateWindow(RhnRegisterFirstbootGuiWindow,
rhnregGui.ActivateSubscri
def __init__(self):
RhnRegisterFirstbootGuiWindow.__init__(self)
rhnregGui.ActivateSubscriptionPage.__init__(self)
+ if rhnreg.registered():
+ self.skipme = True
def updatePage(self):
self.activateSubscriptionPagePrepare()
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
index 1ed7a30..87b6662 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
@@ -41,6 +41,7 @@ class RetryServer(rpclib.Server):
except rpclib.Fault:
raise
except httplib.BadStatusLine:
+ self.log.log_me("Error: Server Unavailable. Please try later.")
stdoutMsgCallback(
_("Error: Server Unavailable. Please try later."))
sys.exit(-1)
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 1a0b102..bde6dc8 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -13,9 +13,9 @@ BuildRequires: rhpl
BuildRequires: intltool
BuildRequires: gettext
-Requires: yum >= 3.0-5.3
-Requires: rhn-client-tools >= 0.4.19
-Requires: m2crypto
+Requires: yum >= 3.2.19-15
+Requires: rhn-client-tools >= 0.4.19-9
+Requires: m2crypto >= 0.16-6.el5.6
# Not really, but for upgrades we need these
Requires: rhn-setup
@@ -60,9 +60,18 @@ make -f Makefile.yum-rhn-plugin install VERSION=%{version}-%{release}
PREFIX=$RP
%changelog
+* Mon Aug 3 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.5.4-13%{?dist}
+- Resolves: #514503
+
* Fri Jun 26 2009 John Matthews <jmatthew(a)redhat.com> 0.5.7-1
- yum-rhn-plugin requires m2crypto
+* Mon Jun 22 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.5.4-10%{?dist}
+- Resolves: #484245
+
+* Fri Jun 12 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.5.4-9%{?dist}
+- Resolves: #467866
+
* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.5.6-1
- yum operations are not getting redirected as the GET requested is formed at
the plugin level and not through rhnlib. (pkilambi(a)redhat.com)
Show replies by thread