Changeset aca97582 in mainline for tools/config.py

Timestamp:

2019-06-30T11:12:32Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a5269d

Parents:

d22be89

Message:

tools/config.py: Clean up argument handling

File:

• tools/config.py (modified) (6 diffs)

tools/config.py

@@ -42 +42 @@
 import random
 
-RULES_FILE = sys.argv[1]
+ARGPOS_RULES = 1
+ARGPOS_CHOICE = 2
+ARGPOS_PRESET = 3
+
+RULES_FILE = sys.argv[ARGPOS_RULES]
 MAKEFILE = 'Makefile.config'
 MACROS = 'config.h'
@@ -676 +680 @@
         parse_rules(RULES_FILE, rules)
 
+        if len(sys.argv) > ARGPOS_CHOICE:
+                choice = sys.argv[ARGPOS_CHOICE]
+        else:
+                choice = None
+
+        if len(sys.argv) > ARGPOS_PRESET:
+                preset = sys.argv[ARGPOS_PRESET]
+        else:
+                preset = None
+
         # Input configuration file can be specified on command line
         # otherwise configuration from previous run is used.
-        if len(sys.argv) >= 4:
-                profile = parse_profile_name(sys.argv[3])
+        if preset is not None:
+                profile = parse_profile_name(preset)
                 read_presets(profile, config)
         elif os.path.exists(MAKEFILE):
@@ -685 +699 @@
 
         # Default mode: check values and regenerate configuration files
-        if (len(sys.argv) >= 3) and (sys.argv[2] == 'default'):
+        if choice == 'default':
                 if (infer_verify_choices(config, rules)):
                         preprocess_config(config, rules)
@@ -693 +707 @@
         # Hands-off mode: check values and regenerate configuration files,
         # but no interactive fallback
-        if (len(sys.argv) >= 3) and (sys.argv[2] == 'hands-off'):
-                # We deliberately test sys.argv >= 4 because we do not want
+        if choice == 'hands-off':
+                # We deliberately test this because we do not want
                 # to read implicitly any possible previous run configuration
-                if len(sys.argv) < 4:
+                if preset is None:
                         sys.stderr.write("Configuration error: No presets specified\n")
                         return 2
@@ -709 +723 @@
 
         # Check mode: only check configuration
-        if (len(sys.argv) >= 3) and (sys.argv[2] == 'check'):
+        if choice == 'check':
                 if infer_verify_choices(config, rules):
                         return 0
@@ -715 +729 @@
 
         # Random mode
-        if (len(sys.argv) == 3) and (sys.argv[2] == 'random'):
+        if choice == 'random':
                 ok = random_choices(config, rules, 0)
                 if not ok: