Consolidate file fetching error handling into one set of urlgrabber error

callbacks.  Allow retrying when the error dialog is displayed (#183974).

1 files changed, 23 insertions, 0 deletions

diff --git a/image.py b/image.py
index 0caa79009..e2f9f560e 100644
--- a/image.py
+++ b/image.py
@@ -141,6 +141,14 @@ class CdromInstallMethod(ImageInstallMethod):
     def ejectCD(self):
         isys.ejectCdrom(self.device, makeDevice=1)
 
+    def badPackageError(self, pkgname):
+        return _("The file %s cannot be opened.  This is due to a missing "
+                 "file or perhaps a corrupt package.  Please verify your "
+                 "installation images and that you have all the required "
+                 "media.\n\n"
+                 "If you reboot, your system will be left in an inconsistent "
+                 "state that will likely require reinstallation.\n\n") % pkgname
+
     def systemUnmounted(self):
 	if self.loopbackFile:
 	    isys.makeDevInode("loop0", "/tmp/loop")
@@ -346,6 +354,13 @@ class CdromInstallMethod(ImageInstallMethod):
 
 class NfsInstallMethod(ImageInstallMethod):
 
+    def badPackageError(self, pkgname):
+        return _("The file %s cannot be opened.  This is due to a missing "
+                 "file or perhaps a corrupt package.  Please verify your "
+                 "installation tree contains all required packages.\n\n"
+                 "If you reboot, your system will be left in an inconsistent "
+                 "state that will likely require reinstallation.\n\n") % pkgname
+
     def __init__(self, method, rootPath, intf):
         """@param method: nfs:/mnt/source"""
         tree = method[5:]
@@ -451,6 +466,14 @@ class NfsIsoInstallMethod(NfsInstallMethod):
 	    self.umountImage()
 	    self.mountImage(mediano)
 
+    def badPackageError(self, pkgname):
+        return _("The file %s cannot be opened.  This is due to a missing "
+                 "file or perhaps a corrupt package.  Please verify your "
+                 "installation images and that you have all the required "
+                 "media.\n\n"
+                 "If you reboot, your system will be left in an inconsistent "
+                 "state that will likely require reinstallation.\n\n") % pkgname
+
     def umountImage(self):
 	if self.currentMedia:
 	    isys.umount(self.mntPoint)