[PATCH] Do not try other alternatives if installing default version is enough
Ansgar Burchardt
ansgar at 43-1.org
Mon Jul 5 08:35:27 UTC 2010
When we encounter
Build-Depends: pkg-a (>= 2) | pkg-b (>= 3)
and a lower version of pkg-a is already installed (or provided by
another package), sbuild would try to upgrade pkg-b as well.
This patch changes the behaviour of sbuild to not try satisfying
alternative dependencies if the dependency can be satisfied by
installing the default version.
Bug-Debian: http://bugs.debian.org/586275
Signed-off-by: Ansgar Burchardt <ansgar at 43-1.org>
---
lib/Sbuild/InternalBuildDepSatisfier.pm | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lib/Sbuild/InternalBuildDepSatisfier.pm b/lib/Sbuild/InternalBuildDepSatisfier.pm
index 335a03c..49f8e95 100644
--- a/lib/Sbuild/InternalBuildDepSatisfier.pm
+++ b/lib/Sbuild/InternalBuildDepSatisfier.pm
@@ -281,6 +281,8 @@ sub filter_dependencies {
return 0;
} else {
$builder->log("Using default version " . $policy->{$name}->{defversion} . "\n");
+ $upgradeable = $name if !$upgradeable;
+ last;
}
$upgradeable = $name if !$upgradeable;
}
--
1.7.1
--=-=-=--
More information about the Buildd-tools-devel
mailing list