aboutsummaryrefslogtreecommitdiff
path: root/pbuilder-buildpackage
diff options
context:
space:
mode:
authordancer <dancer>2001-11-08 01:54:21 +0000
committerdancer <dancer>2001-11-08 01:54:21 +0000
commit23d64aadabdc9bf4714b84e76be5fcaa1342404b (patch)
tree5bb8532faddeed5b71fdd63437313d26882bce6c /pbuilder-buildpackage
parent12a20ca5ede85960359b829da938a51e9b776d67 (diff)
downloadpbuilder-23d64aadabdc9bf4714b84e76be5fcaa1342404b.tar
pbuilder-23d64aadabdc9bf4714b84e76be5fcaa1342404b.tar.gz
fixed build-conflicts logic
Diffstat (limited to 'pbuilder-buildpackage')
-rwxr-xr-xpbuilder-buildpackage15
1 files changed, 9 insertions, 6 deletions
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 0512c30..be017c8 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -124,12 +124,15 @@ function checkbuilddep_internal () {
continue;
fi
fi
- #echo " -> Removing $INSTALLPKG"
- $CHROOTEXEC usr/bin/apt-get -y remove $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') || (
- echo Could not satisfy build-conflicts
- abortingfunction
- exit 1
- )
+
+
+ if $CHROOTEXEC usr/bin/dpkg -s $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}'); then
+ if ! $CHROOTEXEC usr/bin/apt-get -y remove $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') ; then
+ echo Could not satisfy build-conflicts
+ abortingfunction
+ exit 1
+ fi
+ fi
done
}