diff options
| author | dancer <dancer> | 2001-09-06 08:21:14 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2001-09-06 08:21:14 +0000 |
| commit | 4bdc729d3b4f956ab6b846496bd21436e6c3e26a (patch) | |
| tree | e4b9bbbcf0e743551319b70e454cb66ba3747585 /pbuilder-buildpackage | |
| parent | 8c758a6a66daea4559ee6e8910374927069e6d97 (diff) | |
| download | pbuilder-4bdc729d3b4f956ab6b846496bd21436e6c3e26a.tar pbuilder-4bdc729d3b4f956ab6b846496bd21436e6c3e26a.tar.gz | |
Fixed bug using tr method.
Diffstat (limited to 'pbuilder-buildpackage')
| -rwxr-xr-x | pbuilder-buildpackage | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index 960ff23..eeb1d6b 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -20,27 +20,28 @@ function checkbuilddep_internal () { echo " -> Attempting to parse the build-deps by myself" for INSTALLPKGMULTI in $(grep "^Build-Depends\(-Indep\|\): " "$BUILDPLACE/"tmp/buildd/*/debian/control | \ sed 's/^[^:]*: \(.*\)$/\1/' | \ - awk 'BEGIN{RS=","} {print $1}'); do - echo " -> Considering $INSTALLPKGMULTI" + tr " " "/" | \ + awk 'BEGIN{RS=","} {print}'); do + #echo " -> Considering $INSTALLPKGMULTI" SATISFIED="no" for INSTALLPKG in $(echo "$INSTALLPKGMULTI" | \ awk 'BEGIN{RS="|"} {print}'); do - echo " -> Trying to install $INSTALLPKG" + #echo " -> Trying to install $INSTALLPKG" if echo "$INSTALLPKG" | grep '\[' > /dev/null ; then # this package has arch-deps. - if echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[ ]!$ARCH[] ]" > /dev/null; then + if echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/]!$ARCH[]/]" > /dev/null; then # don't install this on this arch -- satisfied? maybe. FIXME SATISFIED="yes" continue; fi - if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[ ]$ARCH[] ]" > /dev/null; then + if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/]$ARCH[]/]" > /dev/null; then # this arch is not listed. -- satisfied? maybe. FIXME SATISFIED="yes" continue; fi fi - echo " -> Installing $INSTALLPKG" - $CHROOTEXEC usr/bin/apt-get -y install $(echo "$INSTALLPKG" | awk '{print $1}') && \ + #echo " -> Installing $INSTALLPKG" + $CHROOTEXEC usr/bin/apt-get -y install $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') && \ SATISFIED="yes" done; if [ "$SATISFIED" = "no" ]; then @@ -51,21 +52,22 @@ function checkbuilddep_internal () { done; for INSTALLPKG in $(grep "^Build-Conflicts\(-Indep\|\): " "$BUILDPLACE/"tmp/buildd/*/debian/control | \ sed 's/^[^:]*: \(.*\)$/\1/' | \ - awk 'BEGIN{RS=","} {print $1}'); do - echo " -> Considering $INSTALLPKG" + tr " " "/" | \ + awk 'BEGIN{RS=","} {print}'); do + #echo " -> Considering $INSTALLPKG" if echo "$INSTALLPKG" | grep '\[' > /dev/null ; then # this package has arch-conflicts. - if echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[ ]!$ARCH[] ]" > /dev/null; then + if echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/]!$ARCH[]/]" > /dev/null; then # don't install this on this arch continue; fi - if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[ ]$ARCH[] ]" > /dev/null; then + if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/]$ARCH[]/]" > /dev/null; then # this arch is not listed. continue; fi fi - echo " -> Removing $INSTALLPKG" - $CHROOTEXEC usr/bin/apt-get -y remove $(echo "$INSTALLPKG" | awk '{print $1}') || ( + #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 |