From 23d64aadabdc9bf4714b84e76be5fcaa1342404b Mon Sep 17 00:00:00 2001
From: dancer <dancer>
Date: Thu, 8 Nov 2001 01:54:21 +0000
Subject: fixed build-conflicts logic

---
 pbuilder-buildpackage | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'pbuilder-buildpackage')

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
 }
 
-- 
cgit v1.2.3