Release new version 0.9.23.

[grml2usb.git] / grml2usb

diff --git a/grml2usb b/grml2usb
index cb4d621..70bcb8b 100755 (executable)
--- a/grml2usb
+++ b/grml2usb
@@ -21,7 +21,7 @@ import glob
 import uuid
 
 # global variables
 import uuid
 
 # global variables

-PROG_VERSION = "0.9.20"
+PROG_VERSION = "0.9.23"

 MOUNTED = set()  # register mountpoints
 TMPFILES = set() # register tmpfiles
 DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
 MOUNTED = set()  # register mountpoints
 TMPFILES = set() # register tmpfiles
 DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg


@@ -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
 
     # * 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:
     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....")
         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)
 
             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":
         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":