From: Michael Prokop <mika@grml.org>
Date: Mon, 4 May 2009 20:27:40 +0000 (+0200)
Subject: Catch exception if copying files fails
X-Git-Tag: v0.9.5~4
X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=f533d16bcabc16dff4dc8910be889a4530454f51;hp=3d119415a53423cdc75f5ae9434bff713c0876be;ds=sidebyside

Catch exception if copying files fails
---

diff --git a/grml2usb b/grml2usb
index 9709ad5..c3e8025 100755
--- a/grml2usb
+++ b/grml2usb
@@ -959,6 +959,7 @@ 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")
+        raise CriticalException("error locating squashfs file")
     else:
         squashfs_target = target + '/live/' + grml_flavour + '/'
         execute(mkdir, squashfs_target)
@@ -1173,8 +1174,12 @@ def install_iso_files(grml_flavour, iso_mount, device, target):
         return 0
     elif not options.bootloaderonly:
         logging.info("Copying files. This might take a while....")
-        copy_system_files(grml_flavour, iso_mount, target)
-        copy_grml_files(iso_mount, target)
+        try:
+            copy_system_files(grml_flavour, iso_mount, target)
+            copy_grml_files(iso_mount, target)
+        except CriticalException, error:
+            logging.critical("Execution failed: %s", error)
+            sys.exit(1)
 
     if not options.skipaddons:
         if grml_flavour.endswith('-small'):