From f533d16bcabc16dff4dc8910be889a4530454f51 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 4 May 2009 22:27:40 +0200 Subject: [PATCH] Catch exception if copying files fails --- grml2usb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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'): -- 2.1.4