Move addl_arg_parse() from catalyst.support to catalyst.util

diff --git a/modules/catalyst/support.py b/modules/catalyst/support.py
index 5e19634926fb959db730aec0075fe83d2b662e26..f446438f7c1228e5bed115e77ae2bd9082458fe6 100644 (file)
--- a/modules/catalyst/support.py
+++ b/modules/catalyst/support.py
@@ -44,18 +44,3 @@ that the order of multiple-value items is preserved, but the order that the item
 defined are not preserved. In other words, "foo", "bar", "oni" ordering is preserved but "item1"
 "item2" "item3" ordering is not, as the item strings are stored in a dictionary (hash).
 """
-
-def addl_arg_parse(myspec,addlargs,requiredspec,validspec):
-       "helper function to help targets parse additional arguments"
-       global valid_config_file_values
-
-       for x in addlargs.keys():
-               if x not in validspec and x not in valid_config_file_values and x not in requiredspec:
-                       raise CatalystError, "Argument \""+x+"\" not recognized."
-               else:
-                       myspec[x]=addlargs[x]
-
-       for x in requiredspec:
-               if not x in myspec:
-                       raise CatalystError, "Required argument \""+x+"\" not specified."
-

diff --git a/modules/catalyst/target/generic.py b/modules/catalyst/target/generic.py
index 76cd2ecfee0645e933429f5f33086eb1bf7afb91..acb29147e079cf9ca66faba30eaea827d6f51210 100644 (file)
--- a/modules/catalyst/target/generic.py
+++ b/modules/catalyst/target/generic.py
@@ -2,13 +2,12 @@
 The toplevel class for generic_stage_target. This is about as generic as we get.
 """
 
-import os
-from catalyst.support import *
+import catalyst
 
 class generic_target:
 
        def __init__(self,myspec,addlargs):
-               addl_arg_parse(myspec,addlargs,self.required_values,self.valid_values)
+               catalyst.util.addl_arg_parse(myspec,addlargs,self.required_values,self.valid_values)
                self.settings=myspec
                self.env={}
                self.env["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin"

diff --git a/modules/catalyst/util.py b/modules/catalyst/util.py
index 8fa9ac31bfd59267584410a7c0cf3bc07aad126d..d516b1f520060c3b0376aa81869539f55dbbb0bb 100644 (file)
--- a/modules/catalyst/util.py
+++ b/modules/catalyst/util.py
@@ -176,3 +176,17 @@ def read_makeconf(mymakeconffile):
                makeconf={}
                return makeconf
 
+def addl_arg_parse(myspec,addlargs,requiredspec,validspec):
+       "helper function to help targets parse additional arguments"
+       global valid_config_file_values
+
+       for x in addlargs.keys():
+               if x not in validspec and x not in valid_config_file_values and x not in requiredspec:
+                       raise CatalystError, "Argument \""+x+"\" not recognized."
+               else:
+                       myspec[x]=addlargs[x]
+
+       for x in requiredspec:
+               if not x in myspec:
+                       raise CatalystError, "Required argument \""+x+"\" not specified."
+