Stick optional config file values in a tuple and concatenate with required values

diff --git a/ChangeLog b/ChangeLog
index a376cba3f8d9d56d1e4050822c19d8098ef3c2bf..5cba87cbf891cfa8f924e5eea283b5153a8d7d13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  12 Sep 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/config.py, modules/catalyst/target/generic.py:
+  Stick optional config file values in a tuple and concatenate with required
+  values
+
   12 Sep 2009; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/livecdfs-update.sh:
   Apply patch from Gentoo bug #284585

diff --git a/modules/catalyst/config.py b/modules/catalyst/config.py
index fc36ce272500445ef7941a6a9d8588537f03537d..5a06ffe949fd3542f6616d01e0cf24579fec6090 100644 (file)
--- a/modules/catalyst/config.py
+++ b/modules/catalyst/config.py
@@ -2,28 +2,15 @@ import re
 from catalyst.error import *
 from catalyst.output import *
 
-required_config_file_values=["storedir","sharedir","distdir","portdir"]
-valid_config_file_values=required_config_file_values[:]
-valid_config_file_values.append("PKGCACHE")
-valid_config_file_values.append("KERNCACHE")
-valid_config_file_values.append("CCACHE")
-valid_config_file_values.append("DISTCC")
-valid_config_file_values.append("ICECREAM")
-valid_config_file_values.append("ENVSCRIPT")
-valid_config_file_values.append("AUTORESUME")
-valid_config_file_values.append("FETCH")
-valid_config_file_values.append("CLEAR_AUTORESUME")
-valid_config_file_values.append("options")
-valid_config_file_values.append("DEBUG")
-valid_config_file_values.append("VERBOSE")
-valid_config_file_values.append("PURGE")
-valid_config_file_values.append("PURGEONLY")
-valid_config_file_values.append("SNAPCACHE")
-valid_config_file_values.append("snapshot_cache")
-valid_config_file_values.append("hash_function")
-valid_config_file_values.append("digests")
-valid_config_file_values.append("contents")
-valid_config_file_values.append("SEEDCACHE")
+required_config_file_values = ("storedir", "sharedir", "distdir", "portdir")
+optional_config_file_values = (
+       "PKGCACHE", "KERNCACHE", "CCACHE", "DISTCC", "ICECREAM", "ENVSCRIPT",
+       "AUTORESUME", "FETCH", "CLEAR_AUTORESUME", "options", "DEBUG", "VERBOSE",
+       "PURGE", "PURGEONLY", "SNAPCACHE", "snapshot_cache", "hash_function",
+       "digests", "contents", "SEEDCACHE"
+)
+
+valid_config_file_values = required_config_file_values + optional_config_file_values
 
 class ParserBase:
 

diff --git a/modules/catalyst/target/generic.py b/modules/catalyst/target/generic.py
index aea74d3d12f5ce6661cdf07de69af6022d950727..a0b53fce23906372480f41d44147eb9d403c2e3f 100644 (file)
--- a/modules/catalyst/target/generic.py
+++ b/modules/catalyst/target/generic.py
@@ -34,7 +34,6 @@ class generic_target:
                if not os.path.exists(self.settings["autoresume_path"]):
                        os.makedirs(self.settings["autoresume_path"],0755)
 
-
        def check_autoresume(self, step=None):
                if "AUTORESUME" in self.settings:
                        if step: