X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml2usb;h=479f590f36302d0837925b56c798089dac639148;hb=a985bb5b68d8520bc22e35f247e4afbe7bb0c1f4;hp=abc51f07f50a6c3535aa2be25db9cd8c4e3b9f7d;hpb=88d1cffddfa5c263556f98c091bf42366aaf8996;p=grml2usb.git

diff --git a/grml2usb b/grml2usb
index abc51f0..479f590 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....")
@@ -1918,6 +1918,9 @@ def handle_bootloader(device):
 
 def main():
     """Main function [make pylint happy :)]"""
+    global GRML_FLAVOURS
+    global GRML_DEFAULT
+    global PROG_VERSION
 
     if options.version:
         print os.path.basename(sys.argv[0]) + " " + PROG_VERSION