From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 19 Jan 2010 16:04:32 +0000 (+0000)
Subject: move the 'Requires: pcucontrol' from myplc to PLCAPI, as it's needed by RebootNodeWithPCU
X-Git-Tag: pcucontrol-1.0-1~3
X-Git-Url: http://git.onelab.eu/?p=pcucontrol.git;a=commitdiff_plain;h=3d319b7ef0167eb99c0d6d4748cbe7316a90b3b3

move the 'Requires: pcucontrol' from myplc to PLCAPI, as it's needed by RebootNodeWithPCU
fix pcucontrol use of old-fashioned 'which'
---

diff --git a/pcucontrol/transports/pyssh/__init__.py b/pcucontrol/transports/pyssh/__init__.py
index 78bb951..0c5cf4f 100644
--- a/pcucontrol/transports/pyssh/__init__.py
+++ b/pcucontrol/transports/pyssh/__init__.py
@@ -43,7 +43,7 @@ if os.name=='posix':
                    # if sufficient.
     sshpopen2=ptyext.popen2
     CLOSE_STR='~.'
-    tp=os.popen('/usr/bin/which ssh')
+    tp=os.popen('bash -c "type -p ssh"')
     SSH_PATH=tp.read().strip()
     try:
         tp.close()