Always assign an value to GRML_DEFAULT

[grml2usb.git] / grml2usb

diff --git a/grml2usb b/grml2usb
index 708409b..1155a4a 100755 (executable)
--- a/grml2usb
+++ b/grml2usb
@@ -26,8 +26,8 @@ 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 " +
@@ -1000,7 +1000,6 @@ def write_uuid(target_file):
 
 
 def get_uuid(target):
-    print 1111
     conf_target = target + "/conf/"
     uuid_file_name = conf_target + "/bootid.txt"
     if os.path.isdir(conf_target):
@@ -1253,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....")
@@ -1919,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