[svn] r4887 - trunk/tools/yam

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-11-17 12:58:12 +0100 (Fri, 17 Nov 2006)
New Revision: 4887

Modified:
   trunk/tools/yam/ChangeLog
   trunk/tools/yam/rhnget
Log:
Small improvement to work better on CentOS

Modified: trunk/tools/yam/ChangeLog
===================================================================
--- trunk/tools/yam/ChangeLog	2006-11-17 08:19:53 UTC (rev 4886)
+++ trunk/tools/yam/ChangeLog	2006-11-17 11:58:12 UTC (rev 4887)
@@ -6,6 +6,7 @@
 - Added proxy support to rhnget (no need anymore to tweak /etc/sysconfig/rhn/up2date)
 - Remove obsolete RHN packages (rhnget-cleanup/--delete option)
 - Added mailfrom directive to overwrite the sender address for mail reports (Jason Kim)
+- Hardcoded xmlrpc.rhn.redhat.com in rhnget (Matt Hyclak)
 
 * 0.8.3 - Van Eyck - released 15/10/2006
 - Fixed a problem with specific python versions (Justin B Hochstetler)

Modified: trunk/tools/yam/rhnget
===================================================================
--- trunk/tools/yam/rhnget	2006-11-17 08:19:53 UTC (rev 4886)
+++ trunk/tools/yam/rhnget	2006-11-17 11:58:12 UTC (rev 4887)
@@ -247,6 +247,7 @@
 	cfg['httpProxy'] = ''
 	cfg['proxyUser='] = ''
 	cfg['proxyPassword'] = ''
+	cfg["sslCACert"] = '/usr/share/rhn/RHNS-CA-CERT'
 
 	### Override the version if forced in Yam configuration (to allow single systemid usage)
 	if op.rhnrelease:
@@ -266,13 +267,15 @@
 
 	### If we're not targetting the default RHN server, change the location
 	rhnscheme, rhnserver, t, t, t, t = urlparse.urlparse(url)
-	if rhnserver:
-		cfg['noSSLServerURL'] = 'http://%s/XMLRPC' % rhnserver
-		if rhnscheme == 'rhn':
-			cfg['serverURL'] = 'http://%s/XMLRPC' % rhnserver
-		else:
-			cfg['serverURL'] = 'https://%s/XMLRPC' % rhnserver
+	if not rhnserver:
+		rhnserver = 'xmlrpc.rhn.redhat.com'
 
+	cfg['noSSLServerURL'] = 'http://%s/XMLRPC' % rhnserver
+	if rhnscheme == 'rhn':
+		cfg['serverURL'] = 'http://%s/XMLRPC' % rhnserver
+	else:
+		cfg['serverURL'] = 'https://%s/XMLRPC' % rhnserver
+
 	### Get proxy information from environment and set up2date config accordingly
 	proxy = None
 	if os.environ.has_key('http_proxy') and rhnscheme == 'rhn':
@@ -291,7 +294,7 @@
 
 	### Set debugging information to something very high (there seems to be no granularity)
 	if op.verbose >= 3:
-		cfg['debug'] = 10000
+		cfg['debug'] = 1
 
 	info(4, '\nBEFORE LOGIN: logininfo: %s\n' % loginInfo)
 	try: