We don't need to pass conf_values since it's a global var

diff --git a/ChangeLog b/ChangeLog
index 1f0fbd1c81f341809507e0f80de812dc9fa465a1..84af20c7052164102fdd2d138444e772b4f352a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst:
+  We don't need to pass conf_values since it's a global var
+
   11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst:
   Pre-split options from config file and remove unnecessary imported modules
 

diff --git a/catalyst b/catalyst
index 9cc99feb21f3f04a7c446f2adefe1149b3e5fe12..a43b018c9890ef0e1a1ff99c772452064b2c6138 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -182,7 +182,7 @@ def build_target(addlargs, targetmap):
 #              sys.exit(1)
                raise
 
-def verify_digest_and_hash_functions(conf_values):
+def verify_digest_and_hash_functions():
        # Start checking that digests are valid now that the hash_map was imported from catalyst_support
        if conf_values.has_key("digests"):
                for i in conf_values["digests"].split():
@@ -315,7 +315,7 @@ if __name__ == "__main__":
 
        parse_config(myconfig)
        
-       verify_digest_and_hash_functions(conf_values)
+       verify_digest_and_hash_functions()
 
        targetmap = catalyst.target.build_target_map()