diff options
| author | Loïc Minier <lool@dooz.org> | 2007-03-31 23:03:07 +0200 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2007-03-31 23:03:07 +0200 |
| commit | 5efd4d516d740ed35bf6c775be31faf2cfc23601 (patch) | |
| tree | 33bae9927bf8b89a35891efaa50983259b00077c | |
| parent | 0c4ec0d6856d80841ddebd5a41ba9bb42504d2fa (diff) | |
| download | pbuilder-5efd4d516d740ed35bf6c775be31faf2cfc23601.tar pbuilder-5efd4d516d740ed35bf6c775be31faf2cfc23601.tar.gz | |
* Make use of get_control_re() in pbuilder-satisfydepends and
pbuilder-satisfydepends-experimental.
| -rw-r--r-- | pbuilder-satisfydepends | 19 | ||||
| -rwxr-xr-x | pbuilder-satisfydepends-experimental | 19 |
2 files changed, 4 insertions, 34 deletions
diff --git a/pbuilder-satisfydepends b/pbuilder-satisfydepends index 15a14bb..85ca463 100644 --- a/pbuilder-satisfydepends +++ b/pbuilder-satisfydepends @@ -33,15 +33,7 @@ function checkbuilddep_internal () { local CURRENTREALPKGNAME local SATISFIED 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 "/" " " )" @@ -119,14 +111,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/[[/(].*//') 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/[[/(].*//') |