* Make use of get_control_re() in pbuilder-satisfydepends and

  pbuilder-satisfydepends-experimental.

1 files changed, 2 insertions, 17 deletions

diff --git a/pbuilder-satisfydepends-experimental b/pbuilder-satisfydepends-experimental
index b7020ba..ecf9700 100755
--- a/pbuilder-satisfydepends-experimental
+++ b/pbuilder-satisfydepends-experimental
@@ -35,15 +35,7 @@ function checkbuilddep_internal () {
     local PACKAGEVERSIONS
     local CANDIDATE_VERSION
     echo " -> Attempting to parse the build-deps $Id$"
-    for INSTALLPKGMULTI in $(cat ${DEBIAN_CONTROL} | \
-	awk '
-BEGIN{source=1} 
-/^$/      {source=0} 
-/^Source:/      {source=1} 
-/^[^ ]*:/ {p=0} 
-tolower($0) ~ /^'"${BD_REGEXP}"':/   {p=1} 
-{if(p && source) {print $0}}'  | \
-	sed 's/^[^: ]*://' | \
+    for INSTALLPKGMULTI in $(get_control_re "$DEBIAN_CONTROL" "$BD_REGEXP" |
 	tr " " "/" | \
 	awk 'BEGIN{RS=","} {print}'); do
       echo " -> Considering build-dep$(echo "$INSTALLPKGMULTI" | tr "/" " " )"
@@ -140,14 +132,7 @@ tolower($0) ~ /^'"${BD_REGEXP}"':/   {p=1}
     fi
 
     # start processing build-conflicts.
-    for INSTALLPKG in $(cat "${DEBIAN_CONTROL}" | \
-	awk 'BEGIN{source=1} 
-/^$/      {source=0} 
-/^Source:/      {source=1} 
-/^[^ ]*:/{p=0} 
-tolower($0) ~ /^'"${BC_REGEXP}"':/   {p=1} 
-{if(p && source) {print $0}}'  | \
-	sed 's/^[^: ]*://' | \
+    for INSTALLPKG in $(get_control_re "$DEBIAN_CONTROL" "$BC_REGEXP" |
 	tr " " "/" | \
 	awk 'BEGIN{RS=","} {print}'); do
       CURRENTREALPKGNAME=$(echo "$INSTALLPKG" | sed -e 's/^[/]*//' -e 's/[[/(].*//')