From 5276a2374013612a6ead6e9b1f18ea4f84105cec Mon Sep 17 00:00:00 2001
From: meisterluk <admin@lukas-prokop.at>
Date: Fri, 3 May 2013 19:09:27 +0200
Subject: [PATCH] Provide top-level critical error message.

Instead of registering error message using the logging module before
raising the corresponding Exception, we use the Exception to provide
user-level error messages (and use logging.debug or logging.error to
store dev-level error messages before).

The main routine catches those exceptions and forwards the messages
to the logging module.
---
 grml2usb | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/grml2usb b/grml2usb
index 0730f7b..0c9ffc0 100755
--- a/grml2usb
+++ b/grml2usb
@@ -538,11 +538,12 @@ def install_mbr(mbrtemplate, device, partition, ismirbsdmbr=True):
     logging.info("Installing default MBR")
 
     if not os.path.isfile(mbrtemplate):
-        logging.critical("Error: %s can not be read.", mbrtemplate)
-        raise CriticalException("Error installing MBR (either try --syslinux-mbr or install missing file \"%s\"?)" % mbrtemplate)
+        logging.error('Error installing MBR (either try --syslinux-mbr or '
+            'install missing file "%s"?)', mbrtemplate)
+        raise CriticalException("Error: %s can not be read.", mbrtemplate)
 
     if partition is not None and ((partition < 0) or (partition > 3)):
-        logging.warn("Cannot activate partition %d" % partition)
+        logging.warn("Cannot activate partition %d", partition)
         partition = None
 
     if ismirbsdmbr:
@@ -663,7 +664,6 @@ def unmount(target, unmount_options):
         proc = subprocess.Popen(["umount"] + list(unmount_options) + [target])
         proc.wait()
         if proc.returncode != 0:
-            logging.critical("Error executing umount")
             raise Exception("Error executing umount")
         else:
             logging.debug("unregister_mountpoint(%s)", target)
@@ -795,9 +795,9 @@ def copy_system_files(grml_flavour, iso_mount, target):
 
     squashfs = search_file(grml_flavour + '.squashfs', iso_mount)
     if squashfs is None:
-        logging.critical("Fatal: squashfs file not found"
-        ", please check that your iso is not corrupt")
-        raise CriticalException("error locating squashfs file")
+        logging.error("error locating squashfs file")
+        raise CriticalException("Fatal: squashfs file not found"
+            ", please check that your iso is not corrupt")
     else:
         squashfs_target = target + '/live/' + grml_flavour + '/'
         execute(mkdir, squashfs_target)
@@ -808,8 +808,8 @@ def copy_system_files(grml_flavour, iso_mount, target):
         if filesystem_module:
             break
     if filesystem_module is None:
-        logging.critical("Fatal: filesystem.module not found")
-        raise CriticalException("error locating filesystem.module file")
+        logging.error("error locating filesystem.module file")
+        raise CriticalException("filesystem.module not found")
     else:
         exec_rsync(filesystem_module, squashfs_target + 'filesystem.module')
 
@@ -823,8 +823,8 @@ def copy_system_files(grml_flavour, iso_mount, target):
             kernel = search_file('linux26', iso_mount)
 
         if kernel is None:
-            logging.critical("Fatal: kernel not found")
-            raise CriticalException("error locating kernel file")
+            logging.error("error locating kernel file")
+            raise CriticalException("Kernel not found")
 
         source = os.path.dirname(kernel) + '/'
         dest = target + '/' + os.path.dirname(kernel).replace(iso_mount, '') + '/'
@@ -1047,10 +1047,10 @@ def copy_bootloader_files(iso_mount, target, grml_flavour):
     (source_dir, defaults_file) = get_defaults_file(iso_mount, grml_flavour, "grml.cfg")
 
     if not source_dir:
-        logging.critical("Fatal: file default.cfg could not be found.")
-        logging.critical("Note:  this grml2usb version requires an ISO generated by grml-live >=0.9.24 ...")
-        logging.critical("       ... either use grml releases >=2009.10 or switch to an older grml2usb version.")
-        raise CriticalException("file default.cfg could not be found.")
+        raise CriticalException(
+            "Fatal: file default.cfg could not be found." \
+            "Note:  this grml2usb version requires an ISO generated by grml-live >=0.9.24 ..." \
+            "       ... either use grml releases >=2009.10 or switch to an older grml2usb version.")
 
     if not os.path.exists(iso_mount + '/boot/grub/footer.cfg'):
         logging.warning("Warning: Grml releases older than 2011.12 support only one flavour in grub.")
@@ -1164,7 +1164,6 @@ def identify_grml_flavour(mountpath):
         except TypeError, e:
             raise
         except Exception, e:
-            logging.critical("Unexpected error: %s", e)
             raise
         finally:
             if tmpfile:
@@ -1515,11 +1514,7 @@ def install_grml(mountpoint, device):
             logging.critical("Fatal: %s", error)
             raise
         except CriticalException, error:
-            try:
-                mount(device, device_mountpoint, "")
-            except CriticalException, error:
-                logging.critical("Fatal: %s", error)
-                raise
+            mount(device, device_mountpoint, "")
     try:
         grml_flavours = identify_grml_flavour(mountpoint)
         for flavour in set(grml_flavours):
@@ -1782,7 +1777,7 @@ def main():
         logging.info("Finished execution of grml2usb (%s). Have fun with your grml system.", PROG_VERSION)
 
     except Exception, error:
-        # ignore error, error message has already been registered with logging
+        logging.critical("Fatal: %s", str(error))
         sys.exit(1)
 
 
-- 
2.1.4