From: Ulrich Dangel <uli@spamt.net>
Date: Sun, 21 Feb 2010 01:34:30 +0000 (+0100)
Subject: Use GRML_{FLAVOURS,DEFAULT}, PROG_VERSION from global scope.
X-Git-Tag: v0.9.22~6
X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=23a0b09ff4c5d889643fcb216f6acc65a0dc50db

Use GRML_{FLAVOURS,DEFAULT}, PROG_VERSION from global scope.

grml2usb was aborted when using --bootloader-only --skip-grub-config as
parameters. This patch fix the behaviour and declares correctly the
correct scope for these variables.  Thanks to Daniel Tiefnig for
reporting the bug.
---

diff --git a/grml2usb b/grml2usb
index abc51f0..bde7244 100755
--- a/grml2usb
+++ b/grml2usb
@@ -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