X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=414b9c5af49f4484f6f22c7a68861a2273a7957a;hp=a13e6eac9c18f9f523830b5cb8f7910e97aab7eb;hb=779a8334c32bb2389e2cffb32a3fefeb9b3f415c;hpb=e3271ff457c955c12b859591542b3e597677d584 diff --git a/grml2usb b/grml2usb index a13e6ea..414b9c5 100755 --- a/grml2usb +++ b/grml2usb @@ -22,7 +22,7 @@ import uuid import struct # global variables -PROG_VERSION = "0.9.25" +PROG_VERSION = "0.9.26" MOUNTED = set() # register mountpoints TMPFILES = set() # register tmpfiles DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg @@ -910,8 +910,8 @@ def mount(source, target, mount_options): for x in file('/proc/mounts').readlines(): if x.startswith(source): - raise CriticalException("Error executing mount: %s already mounted - " - + "please unmount before invoking grml2usb" % source) + raise CriticalException("Error executing mount: %s already mounted - " % source + + "please unmount before invoking grml2usb") if os.path.isdir(source): logging.debug("Source %s is not a device, therefore not mounting.", source) @@ -990,8 +990,9 @@ def check_for_fat(partition): " (wrong UID/permissions or device/directory not present?)" % partition) if filesystem != "vfat": - raise CriticalException("Partition %s does not contain a FAT16 filesystem. " - + "(Use --fat16 or run mkfs.vfat %s)" % (partition, partition)) + raise CriticalException( + "Partition %s does not contain a FAT16 filesystem." % (partition) \ + + "(Use --fat16 or run mkfs.vfat %s)" % (partition)) except OSError: raise CriticalException("Sorry, /sbin/blkid not available (install e2fsprogs?)")