pbuilder and cowbuilder live in sbin

This commit is contained in:
Stefano Rivera 2012-02-15 16:21:00 +02:00
parent 30da459114
commit f363b745ff

View File

@ -36,11 +36,14 @@ from ubuntutools.sponsor_patch.question import ask_for_manual_fixing
from ubuntutools.sponsor_patch.source_package import SourcePackage from ubuntutools.sponsor_patch.source_package import SourcePackage
def is_command_available(command): def is_command_available(command, check_sbin=False):
"Is command in $PATH?" "Is command in $PATH?"
path = os.environ.get('PATH', '/usr/bin:/bin') path = os.environ.get('PATH', '/usr/bin:/bin').split(':')
if check_sbin:
path += [directory[:-3] + 'sbin'
for directory in path if directory.endswith('/bin')]
return any(os.access(os.path.join(directory, command), os.X_OK) return any(os.access(os.path.join(directory, command), os.X_OK)
for directory in path.split(':')) for directory in path)
def check_dependencies(): def check_dependencies():
@ -51,7 +54,7 @@ def check_dependencies():
missing.append(cmd) missing.append(cmd)
if not is_command_available('bzr-buildpackage'): if not is_command_available('bzr-buildpackage'):
missing.append('bzr-builddeb') missing.append('bzr-builddeb')
if not any(is_command_available(cmd) if not any(is_command_available(cmd, check_sbin=True)
for cmd in ('pbuilder', 'sbuild', 'cowbuilder')): for cmd in ('pbuilder', 'sbuild', 'cowbuilder')):
missing.append('pbuilder/cowbuilder/sbuild') missing.append('pbuilder/cowbuilder/sbuild')