2007-08-13 Jeremy Katz <katzj@redhat.com>

	* yuminstall.py (AnacondaYum._handleFailure): Don't use a method
	specific string that's 99% the same.  Instead, just make the
	string work for everything.
	* installmethod.py (InstallMethod.badPackageError): Remove
	* image.py (badPackageError): Likewise.
	* urlinstall.py (badPackageError): Likewise.

1 files changed, 0 insertions, 23 deletions

diff --git a/image.py b/image.py
index 8a2620a6f..1eaff4212 100644
--- a/image.py
+++ b/image.py
@@ -139,14 +139,6 @@ 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 exit, your system will be left in an inconsistent "
-                 "state that will likely require reinstallation.\n\n") % pkgname
-
     def systemUnmounted(self):
 	if self.loopbackFile:
 	    isys.lochangefd("/dev/loop0", 
@@ -364,13 +356,6 @@ 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 exit, 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:]
@@ -475,14 +460,6 @@ 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 exit, 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)