From 781d077af8ba5daa2b23b874b85721c5fe976284 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Mon, 22 Nov 2010 13:25:55 +0200 Subject: [PATCH] Check for builder in sbin paths even if they aren't in PATH --- pbuilder-dist | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pbuilder-dist b/pbuilder-dist index 52fc179..665e297 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -77,11 +77,9 @@ class pbuilder_dist: self.builder = builder # Ensure that the used builder is installed - for file in os.environ['PATH'].split(':'): - if os.path.exists(os.path.join(file, builder)): - builder = '' - break - if builder: + paths = set(os.environ['PATH'].split(':')) + paths |= set(('/sbin', '/usr/sbin', '/usr/local/sbin')) + if not any(os.path.exists(os.path.join(p, builder)) for p in paths): print 'Error: Could not find "%s".' % builder sys.exit(1)