diff options
author | dancer <dancer> | 2002-02-10 07:34:51 +0000 |
---|---|---|
committer | dancer <dancer> | 2002-02-10 07:34:51 +0000 |
commit | a66d4d0751ac0156a3afbc40980329d2c1073c74 (patch) | |
tree | 18762b388bf38796727935923594d43ad2220d06 /pbuilder-buildpackage | |
parent | c26f9ee45f772c7bad0d243fe12532d213c7759b (diff) | |
download | pbuilder-a66d4d0751ac0156a3afbc40980329d2c1073c74.tar pbuilder-a66d4d0751ac0156a3afbc40980329d2c1073c74.tar.gz |
fix more bug
Diffstat (limited to 'pbuilder-buildpackage')
-rwxr-xr-x | pbuilder-buildpackage | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index 13777b1..04f19cd 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -86,6 +86,7 @@ function checkbuilddep_internal () { SATISFIED="no" for INSTALLPKG in $(echo "$INSTALLPKGMULTI" | \ awk 'BEGIN{RS="|"} {print}'); do + CURRENTREALPKGNAME=$(echo "$INSTALLPKG" | sed 's/[[/(].*//') if echo "$INSTALLPKG" | grep '\[' > /dev/null ; then if checkbuilddep_archdeps "$INSTALLPKG" "$ARCH"; then SATISFIED="yes" @@ -95,14 +96,13 @@ function checkbuilddep_internal () { fi if echo "$INSTALLPKG" | grep '[(]' > /dev/null; then #echo "Debug: $INSTALLPKG" - if ! checkbuilddep_versiondeps $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') \ + if ! checkbuilddep_versiondeps ${CURRENTREALPKGNAME} \ $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*(\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\1/') \ $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*(\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\2/') ; then echo " -> Does not satisfy version, not trying" continue; fi fi - CURRENTREALPKGNAME=$(echo "$INSTALLPKG" | sed 's/[[/(].*//') echo " -> Installing "${CURRENTREALPKGNAME} if $CHROOTEXEC usr/bin/apt-get -y install ${CURRENTREALPKGNAME}; then |