[yum-cvs] yum shell.py,1.16,1.17

[Seth Vidal]

Update of /home/groups/yum/cvs/yum
In directory login:/tmp/cvs-serv23690

Modified Files:
	shell.py 
Log Message:
catch traceback on ts solve errors



Index: shell.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/shell.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- shell.py	28 Mar 2005 03:43:15 -0000	1.16
+++ shell.py	29 Mar 2005 15:55:44 -0000	1.17
@@ -137,7 +137,12 @@
             self.base.doRpmDBSetup()
         
         elif cmd == 'solve':
-            (code, msgs) = self.base.buildTransaction()
+            try:
+                (code, msgs) = self.base.buildTransaction()
+            except Errors.YumBaseError, e:
+                self.base.errorlog(0, 'Error building transaction: %s' % e)
+                return False
+                
             if code == 1:
                 for msg in msgs:
                     self.base.errorlog(0, 'Error: %s' % msg)
@@ -266,7 +271,7 @@
             try:
                 returnval = self.base.doTransaction()
             except Errors.YumBaseError, e:
-                self.base.errorlog(0, '%s' % e)
+                self.base.errorlog(0, 'Error: %s' % e)
             except KeyboardInterrupt, e:
                 self.base.errorlog(0, '\n\nExiting on user cancel')
             except IOError, e: