* added better error reporting for the DistUpgradeFetcher

2 files changed, 29 insertions, 6 deletions

diff --git a/UpdateManager/Common/utils.py b/UpdateManager/Common/utils.py
index ffafadfb..17c62212 100644
--- a/UpdateManager/Common/utils.py
+++ b/UpdateManager/Common/utils.py
@@ -1,3 +1,4 @@
+import gtk
 
 def str_to_bool(str):
   if str == "0" or str.upper() == "FALSE":
@@ -7,3 +8,14 @@ def str_to_bool(str):
 def utf8(str):
   return unicode(str, 'latin1').encode('utf-8')
 
+
+def error(parent, summary, message):
+  d = gtk.MessageDialog(parent=parent,
+                        flags=gtk.DIALOG_MODAL,
+                        type=gtk.MESSAGE_ERROR,
+                        buttons=gtk.BUTTONS_CLOSE)
+  d.set_markup("<big><b>%s</b></big>\n\n%s" % (summary, message))
+  d.set_title("")
+  res = d.run()
+  d.destroy()
+  return
diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py
index 794566c2..bfc51f44 100644
--- a/UpdateManager/DistUpgradeFetcher.py
+++ b/UpdateManager/DistUpgradeFetcher.py
@@ -33,7 +33,7 @@ from gettext import gettext as _
 
 import GtkProgress
 from ReleaseNotesViewer import ReleaseNotesViewer
-
+from Common.utils import *
 
 class DistUpgradeFetcher(object):
 
@@ -196,22 +196,33 @@ class DistUpgradeFetcher(object):
         if not self.showReleaseNotes():
             return
         if not self.fetchDistUpgrader():
-            print "Fetch failed"
+            error("Failed to fetch",
+                  "Fetching the upgrade failed. There may be a network "
+                  "problem. ")
             return
         if not self.extractDistUpgrader():
-            print "extract failed"
+            error("Failed to extract",
+                  "Extracting the upgrade failed. There may be a problem "
+                  "with the network or with the server. ")
+                  
             return
         if not self.verifyDistUprader():
-            print "verify failed"
+            error("Verfication failed",
+                  "Verfing the upgrade failed.  There may be a problem "
+                  "with the network or with the server. ")
             self.cleanup()
             return
         if not self.authenticate():
-            print "authenticate failed"
+            error("Authentication failed",
+                  "Authenticating the upgrade failed. There may be a problem "
+                  "with the network or with the server. ")
             self.cleanup()
             return
         self.runDistUpgrader()
 
 
 if __name__ == "__main__":
-    d = DistUpgradeFetcher(None)
+    error(None, "summary","message")
+    d = DistUpgradeFetcher(None,None)
     print d.authenticate('/tmp/Release','/tmp/Release.gpg')
+