[svn] r4913 - trunk/tools/depo

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-11-20 11:39:28 +0100 (Mon, 20 Nov 2006)
New Revision: 4913

Modified:
   trunk/tools/depo/ChangeLog
   trunk/tools/depo/depo.spec
   trunk/tools/depo/rhnget
Log:
Suppress backtrace and print Exception error within rhnget

Modified: trunk/tools/depo/ChangeLog
===================================================================
--- trunk/tools/depo/ChangeLog	2006-11-20 03:06:20 UTC (rev 4912)
+++ trunk/tools/depo/ChangeLog	2006-11-20 10:39:28 UTC (rev 4913)
@@ -9,6 +9,7 @@
 - Added mailfrom directive to overwrite the sender address for mail reports (Jason Kim)
 - Hardcoded xmlrpc.rhn.redhat.com in rhnget (Matt Hyclak)
 - Fixed a problem when symlink to an existing dangling symlink
+- Suppress backtrace and print Exception error within rhnget
 
 * 0.8.3 - Van Eyck - released 15/10/2006
 - Fixed a problem with specific python versions (Justin B Hochstetler)

Modified: trunk/tools/depo/depo.spec
===================================================================
--- trunk/tools/depo/depo.spec	2006-11-20 03:06:20 UTC (rev 4912)
+++ trunk/tools/depo/depo.spec	2006-11-20 10:39:28 UTC (rev 4913)
@@ -18,7 +18,7 @@
 
 BuildArch: noarch
 BuildRequires: /usr/bin/python2
-Requires: python >= 2.0, createrepo >= 0.4.6
+Requires: python >= 2.0, createrepo
 Obsoletes: yam <= %{version}
 
 %description

Modified: trunk/tools/depo/rhnget
===================================================================
--- trunk/tools/depo/rhnget	2006-11-20 03:06:20 UTC (rev 4912)
+++ trunk/tools/depo/rhnget	2006-11-20 10:39:28 UTC (rev 4913)
@@ -383,7 +383,10 @@
 	except up2dateErrors.CommunicationError, e:
 		raise(MirrorException('Error listing packages from channel %s. Skipping.\n%s' % (label, e)))
 	except KeyError, e:
-		raise(MirrorException('Unknown error that needs more debugging occured with channel %s. Skipping.\n%s' % (label, e)))
+		if e == "'up2date'":
+			raise(MirrorException('Missing up2date entry in /etc/sysconfig/rhn/sources.'))
+		else:
+			raise(MirrorException('Unknown error that needs more debugging occured with channel %s. Skipping.\n%s' % (label, e)))
 
 	### Download packages from the packagelist
 	signal.signal(signal.SIGINT, signal.SIG_DFL)
@@ -447,7 +450,10 @@
 			remove(os.path.join(path, filename))
 
 def main():
-	mirrorrhn(op.uri, op.destination)
+	try:
+		mirrorrhn(op.uri, op.destination)
+	except Exception, e:
+		die(1, e)
 
 ### Unbuffered sys.stdout
 sys.stdout = os.fdopen(1, 'w', 0)