import find_binary directly from snakeoil instead of pkgcore.spawn

5 files changed, 18 insertions, 15 deletions

diff --git a/pkgcore/merge/triggers.py b/pkgcore/merge/triggers.py
index 5e85471e4..5e6ae833a 100644
--- a/pkgcore/merge/triggers.py
+++ b/pkgcore/merge/triggers.py
@@ -39,6 +39,7 @@ demandload(
     're',
     'time',
     'snakeoil.bash:iter_read_bash',
+    'snakeoil.process:find_binary,CommandNotFound',
     'pkgcore:os_data,spawn',
     'pkgcore.fs:fs,contents',
     'pkgcore.fs.livefs:gen_obj',
@@ -365,8 +366,8 @@ class InfoRegen(base):
 
     def get_binary_path(self):
         try:
-            return spawn.find_binary('install-info')
-        except spawn.CommandNotFound:
+            return find_binary('install-info')
+        except CommandNotFound:
             # swallow it.
             return None
 
@@ -775,9 +776,9 @@ class BinaryDebug(ThreadedTrigger):
             obj = getattr(self, "_%s_binary" % x)
             if obj is None:
                 try:
-                    obj = spawn.find_binary("%s-%s" % (pkg.chost, x))
-                except spawn.CommandNotFound:
-                    obj = spawn.find_binary(x)
+                    obj = find_binary("%s-%s" % (pkg.chost, x))
+                except CommandNotFound:
+                    obj = find_binary(x)
             setattr(self, '%s_binary' % x, obj)
 
     def _strip_fsobj(self, fs_obj, ftype, reporter, quiet=False):
diff --git a/pkgcore/spawn.py b/pkgcore/spawn.py
index 2c322af0a..baac51379 100644
--- a/pkgcore/spawn.py
+++ b/pkgcore/spawn.py
@@ -10,7 +10,7 @@ subprocess related functionality
 
 __all__ = [
     "cleanup_pids", "spawn", "spawn_sandbox", "spawn_bash", "spawn_fakeroot",
-    "spawn_get_output", "find_binary",
+    "spawn_get_output",
 ]
 
 import atexit
diff --git a/pkgcore/sync/base.py b/pkgcore/sync/base.py
index a5c725599..d4960594c 100644
--- a/pkgcore/sync/base.py
+++ b/pkgcore/sync/base.py
@@ -19,6 +19,7 @@ demandload(
     'pwd',
     'stat',
     'errno',
+    'snakeoil.process:find_binary,CommandNotFound',
     'pkgcore:os_data,plugin,spawn',
 )
 
@@ -137,8 +138,8 @@ class ExternalSyncer(syncer):
     @staticmethod
     def require_binary(bin_name, fatal=True):
         try:
-            return spawn.find_binary(bin_name)
-        except spawn.CommandNotFound as e:
+            return find_binary(bin_name)
+        except CommandNotFound as e:
             if fatal:
                 raise missing_binary(bin_name, e)
             return None
diff --git a/pkgcore/test/merge/test_triggers.py b/pkgcore/test/merge/test_triggers.py
index f1da0216e..d299c5daa 100644
--- a/pkgcore/test/merge/test_triggers.py
+++ b/pkgcore/test/merge/test_triggers.py
@@ -10,9 +10,9 @@ import time
 
 from snakeoil.currying import post_curry
 from snakeoil.osutils import pjoin, ensure_dirs, normpath
+from snakeoil.process import find_binary, CommandNotFound
 from snakeoil.test import mixins
 
-from pkgcore import spawn
 from pkgcore.fs import fs
 from pkgcore.merge import triggers, const
 from pkgcore.fs.contents import contentsSet
@@ -350,8 +350,8 @@ END-INFO-DIR-ENTRY
         existing = os.environ.get("PATH", self)
         try:
             try:
-                path = spawn.find_binary('install-info')
-            except spawn.CommandNotFound:
+                path = find_binary('install-info')
+            except CommandNotFound:
                 path = None
             self.assertEqual(path, self.trigger.get_binary_path())
             if path is not self:
diff --git a/pkgcore/test/test_spawn.py b/pkgcore/test/test_spawn.py
index 3b5808a61..9ef85aebf 100644
--- a/pkgcore/test/test_spawn.py
+++ b/pkgcore/test/test_spawn.py
@@ -6,6 +6,7 @@ import pwd
 import signal
 
 from snakeoil.currying import post_curry
+from snakeoil.process import find_binary, CommandNotFound
 from snakeoil.test.mixins import TempDirMixin
 
 from pkgcore import spawn
@@ -24,10 +25,10 @@ class SpawnTest(TempDirMixin, TestCase):
 
     def __init__(self, *a, **kw):
         try:
-            self.bash_path = spawn.find_binary("bash")
+            self.bash_path = find_binary("bash")
             self.null_file = open("/dev/null", "w")
             self.null = self.null_file.fileno()
-        except spawn.CommandNotFound:
+        except CommandNotFound:
             self.skip = "bash wasn't found.  this will be ugly."
         super(SpawnTest, self).__init__(*a, **kw)
 
@@ -131,7 +132,7 @@ class SpawnTest(TempDirMixin, TestCase):
             "pkgcore-spawn-fakeroot2.sh",
             "#!%s\nimport os\ns=os.stat('/tmp')\n"
             "print(s.st_uid)\nprint(s.st_gid)\n" %
-            spawn.find_binary("python"))
+            find_binary("python"))
 
         fp1 = self.generate_script(
             "pkgcore-spawn-fakeroot.sh",
@@ -175,7 +176,7 @@ class SpawnTest(TempDirMixin, TestCase):
     def generate_background_pid(self):
         try:
             return spawn.spawn(["sleep", "60s"], returnpid=True)[0]
-        except spawn.CommandNotFound:
+        except CommandNotFound:
             raise SkipTest(
                 "can't complete the test, sleep binary doesn't exist")