X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=grml2usb;h=7e91839022568bc6d1c405f6be1a7fdc212352a0;hb=7f9c07b41d2af167b77e013584e6cc64c90dd98f;hp=bde7244d307ae727924844a9cfde58e321d20d12;hpb=23a0b09ff4c5d889643fcb216f6acc65a0dc50db;p=grml2usb.git

diff --git a/grml2usb b/grml2usb
index bde7244..7e91839 100755
--- a/grml2usb
+++ b/grml2usb
@@ -21,13 +21,13 @@ import glob
 import uuid
 
 # global variables
-PROG_VERSION = "0.9.20"
+PROG_VERSION = "0.9.22"
 MOUNTED = set()  # register mountpoints
 TMPFILES = set() # register tmpfiles
 DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
 GRML_FLAVOURS = set() # which flavours are being installed?
-global GRML_DEFAULT
-global UUID
+GRML_DEFAULT = None
+UUID = None
 
 def syslinux_warning(option, opt, value, parser):
     sys.stderr.write("Note: the --syslinux option is deprecated as syslinux " +
@@ -1252,9 +1252,9 @@ def install_iso_files(grml_flavour, iso_mount, device, target):
     # * provide alternative search_file() if file information is stored in a config.ini file?
     # * catch "install: .. No space left on device" & CO
 
+    global GRML_DEFAULT
+    GRML_DEFAULT = grml_flavour
     if options.dryrun:
-        global GRML_DEFAULT
-        GRML_DEFAULT = grml_flavour
         return 0
     elif not options.bootloaderonly:
         logging.info("Copying files. This might take a while....")
@@ -1858,7 +1858,7 @@ def handle_vfat(device):
             logging.critical("Execution failed: %s", error)
             sys.exit(1)
 
-    if not os.path.isdir(device) and not check_for_usbdevice(device):
+    if not os.path.isdir(device) and not check_for_usbdevice(device) and not option.force:
         print "Warning: the specified device %s does not look like a removable usb device." % device
         f = raw_input("Do you really want to continue? y/N ")
         if f == "y" or f == "Y":