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

diff --git a/ChangeLog b/ChangeLog
index a4e20e6280fd302acb3419437f399814f09ef619..e8412a5c11f51320c653a2089f03d2c6fa4a39e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # 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,
+  modules/catalyst/support.py, modules/catalyst/util.py:
+  Move find_binary() from catalyst.support to catalyst.util
+
   11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst,
   modules/catalyst/arch/__init__.py, +modules/catalyst/output.py,
   modules/catalyst/support.py, modules/catalyst/target/__init__.py,

diff --git a/catalyst b/catalyst
index 367a91c1ce64be700c4b282edbb46cf0693ed28a..c6acf1308eab6540d270e8842fc1b5e11c1e968d 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -167,7 +167,7 @@ def verify_digest_and_hash_functions():
                                print
                                print "Catalyst aborting...."
                                sys.exit(2)
-                       if find_binary(hash_map[i][1]) == None:
+                       if catalyst.util.find_binary(hash_map[i][1]) == None:
                                print
                                print "digest="+i
                                print "\tThe "+hash_map[i][1]+\
@@ -185,7 +185,7 @@ def verify_digest_and_hash_functions():
                        print
                        print "Catalyst aborting...."
                        sys.exit(2)
-               if find_binary(hash_map[conf_values["hash_function"]][1]) == None:
+               if catalyst.util.find_binary(hash_map[conf_values["hash_function"]][1]) == None:
                        print
                        print "hash_function="+conf_values["hash_function"]
                        print "\tThe "+hash_map[conf_values["hash_function"]][1]+\

diff --git a/modules/catalyst/support.py b/modules/catalyst/support.py
index ca97c6e0a66273637efe17bf42f1fe5efd97a091..2a96dae1ff0a72e398e65f6319cf7e3d99499b96 100644 (file)
--- a/modules/catalyst/support.py
+++ b/modules/catalyst/support.py
@@ -1,6 +1,7 @@
 
 import sys,string,os,types,re,signal,traceback,time
 from catalyst.output import warn
+import catalyst.util
 #import md5,sha
 
 selinux_capable = False
@@ -265,19 +266,6 @@ class LockInUse(Exception):
                        print "!!! catalyst lock file in use: "+message
                        print
 
-def find_binary(myc):
-       """look through the environmental path for an executable file named whatever myc is"""
-        # this sucks. badly.
-        p=os.getenv("PATH")
-        if p == None:
-                return None
-        for x in p.split(":"):
-                #if it exists, and is executable
-                if os.path.exists("%s/%s" % (x,myc)) and os.stat("%s/%s" % (x,myc))[0] & 0x0248:
-                        return "%s/%s" % (x,myc)
-        return None
-
-
 def spawn_bash(mycommand,env={},debug=False,opt_name=None,**keywords):
        """spawn mycommand as an arguement to bash"""
        args=[BASH_BINARY]
@@ -373,7 +361,7 @@ def spawn(mycommand,env={},raw_exit_code=False,opt_name=None,fd_pipes=None,retur
                if not os.access(myc, os.X_OK):
                        if not path_lookup:
                                return None
-                       myc = find_binary(myc)
+                       myc = catalyst.util.find_binary(myc)
                        if myc == None:
                            return None
         mypid=[]

diff --git a/modules/catalyst/util.py b/modules/catalyst/util.py
index 9b191326a5b699145a42c9906ad91e68caa99f24..8b6c63b766a6f9fa2b51e8c3a946094dae13328a 100644 (file)
--- a/modules/catalyst/util.py
+++ b/modules/catalyst/util.py
@@ -21,3 +21,16 @@ def load_module(name):
                return sys.modules[name]
        except Exception:
                return None
+
+def find_binary(myc):
+       """look through the environmental path for an executable file named whatever myc is"""
+       # this sucks. badly.
+       p=os.getenv("PATH")
+       if p == None:
+               return None
+       for x in p.split(":"):
+               #if it exists, and is executable
+               if os.path.exists("%s/%s" % (x,myc)) and os.stat("%s/%s" % (x,myc))[0] & 0x0248:
+                       return "%s/%s" % (x,myc)
+       return None
+