aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpbuilder-satisfydepends-funcs23
1 files changed, 2 insertions, 21 deletions
diff --git a/pbuilder-satisfydepends-funcs b/pbuilder-satisfydepends-funcs
index 029d0e1..f78e237 100755
--- a/pbuilder-satisfydepends-funcs
+++ b/pbuilder-satisfydepends-funcs
@@ -50,35 +50,16 @@ function checkbuilddep_versiondeps () {
return 1;
}
-function expand_arch () {
- local ARCH="$1"
- local EXPANDED_ARCH
-
- # just keep the original behavior.
- echo "$ARCH"
- return
-
- # the following may be used if dpkg change is set to stone.
- if echo "$ARCH" | grep "-" > /dev/null; then
- EXPANDED_ARCH=$ARCH
- else
- EXPANDED_ARCH="linux-$ARCH"
- fi
- local WC1=$(echo $EXPANDED_ARCH | sed 's/^[^-]*/any/')
- local WC2=$(echo $EXPANDED_ARCH | sed 's/[^-]*$/any/')
- echo "$ARCH\\|$EXPANDED_ARCH\\|$WC1\\|$WC2"
-}
-
function checkbuilddep_archdeps () {
# returns FALSE on INSTALL
local INSTALLPKG="$1"
local ARCH="$2"
- if echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/][!]\($(expand_arch $ARCH)\)[]/]" > /dev/null; then
+ if echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/][!]\($ARCH\)[]/]" > /dev/null; then
# if !$ARCH exists in there, ERROR.
return 0;
fi
if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[!]" > /dev/null; then
- if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/]\($(expand_arch $ARCH)\)[]/]" > /dev/null; then
+ if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/]\($ARCH\)[]/]" > /dev/null; then
# if $ARCH does not exist, ERROR.
return 0;
fi