projects
/
grml2usb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d11941
)
Catch exception if copying files fails
author
Michael Prokop
<mika@grml.org>
Mon, 4 May 2009 20:27:40 +0000
(22:27 +0200)
committer
Michael Prokop
<mika@grml.org>
Mon, 4 May 2009 20:27:40 +0000
(22:27 +0200)
grml2usb
patch
|
blob
|
history
diff --git
a/grml2usb
b/grml2usb
index
9709ad5
..
c3e8025
100755
(executable)
--- 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")
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)
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....")
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'):
if not options.skipaddons:
if grml_flavour.endswith('-small'):