actionsapi/get.py: Remove duplicate PATHfinder code and use the one Ozan introduced in util module.
This commit is contained in:
+3
-10
@@ -19,6 +19,7 @@ _ = __trans.ugettext
|
|||||||
|
|
||||||
# PiSi Modules
|
# PiSi Modules
|
||||||
import pisi.actionsapi
|
import pisi.actionsapi
|
||||||
|
import pisi.util
|
||||||
import pisi.context as ctx
|
import pisi.context as ctx
|
||||||
|
|
||||||
# ActionsAPI Modules
|
# ActionsAPI Modules
|
||||||
@@ -163,18 +164,10 @@ def qtDIR():
|
|||||||
|
|
||||||
# Binutils Variables
|
# Binutils Variables
|
||||||
|
|
||||||
def existBinary(bin):
|
|
||||||
# determine if path has binary
|
|
||||||
path = os.environ['PATH'].split(':')
|
|
||||||
for directory in path:
|
|
||||||
if os.path.exists(os.path.join(directory, bin)):
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
def getBinutilsInfo(util):
|
def getBinutilsInfo(util):
|
||||||
cross_build_name = '%s-%s' % (HOST(), util)
|
cross_build_name = '%s-%s' % (HOST(), util)
|
||||||
if not existBinary(cross_build_name):
|
if not pisi.util.search_executable(cross_build_name):
|
||||||
if not existBinary(util):
|
if not pisi.util.search_executable(util):
|
||||||
raise BinutilsError(_('Util %s cannot be found') % util)
|
raise BinutilsError(_('Util %s cannot be found') % util)
|
||||||
else:
|
else:
|
||||||
ctx.ui.debug(_('Warning: %s does not exist, using plain name %s') \
|
ctx.ui.debug(_('Warning: %s does not exist, using plain name %s') \
|
||||||
|
|||||||
Reference in New Issue
Block a user