From 595c75e1031d559b93e9089aadf8fba83bcf5704 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Thu, 18 Jun 2015 12:43:53 +0200 Subject: Support build-profiles in classic satisfydeps --- pbuilder-satisfydepends-classic | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'pbuilder-satisfydepends-classic') diff --git a/pbuilder-satisfydepends-classic b/pbuilder-satisfydepends-classic index 12d3107..f149b4f 100755 --- a/pbuilder-satisfydepends-classic +++ b/pbuilder-satisfydepends-classic @@ -45,7 +45,7 @@ split_alternates() { # architecture or version specifier; e.g. "/foo/(>=/2)/[i386/amd64]" becomes # "foo" get_pkg_name() { - echo "$*" | sed 's#^/*##; s#[[/(].*##' + echo "$*" | sed 's#^/*##; s#[[/(<].*##' } # filter operator and version of a "/" escaped versioned build-dep; e.g. @@ -81,6 +81,13 @@ checkbuilddep_internal() { continue fi fi + if echo "$INSTALLPKG" | grep -q '<'; then + if checkbuilddep_restrictiondeps "$INSTALLPKG" "$DEB_BUILD_PROFILES"; then + SATISFIED="yes" + echo " -> This package is not for the current build profiles" + continue + fi + fi if echo "$INSTALLPKG" | grep -q '('; then #echo "Debug: $INSTALLPKG" if ! checkbuilddep_versiondeps "$CURRENTREALPKGNAME" `get_dep_op_and_ver "$INSTALLPKG"`; then @@ -151,6 +158,13 @@ checkbuilddep_internal() { continue fi fi + if echo "$INSTALLPKG" | greq -q '<'; then + # this package has build-profiles-conflicts. + if checkbuilddep_restrictiondeps "$INSTALLPKG" "$DEB_BUILD_PROFILES"; then + echo "I: Ignoring other-buildprofiles" + continue + fi + fi if echo "$INSTALLPKG" | grep -q '('; then # this package has version-conflicts if ! checkbuilddep_versiondeps "$CURRENTREALPKGNAME" `get_dep_op_and_ver "$INSTALLPKG"`; then -- cgit v1.2.3