summaryrefslogtreecommitdiff
path: root/scripts/pkgdelta.sh.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-04-07 11:23:55 -0500
committerDan McGee <dan@archlinux.org>2012-04-07 11:23:55 -0500
commit4ca6590af58177964910588a6d0406f0d009bd0e (patch)
tree3ff2d0d07aa5bd38f13e9456c5f831bdef06b8e2 /scripts/pkgdelta.sh.in
parent3f1ea8b62f46a915c94a5b46e21ad39ea2628f65 (diff)
parentb752561a52a88f8e9cc3bcc9c2079eb685245110 (diff)
Merge branch 'maint'
Conflicts: lib/libalpm/signing.c lib/libalpm/sync.c
Diffstat (limited to 'scripts/pkgdelta.sh.in')
-rw-r--r--scripts/pkgdelta.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in
index 5a2e6a37..992c85f3 100644
--- a/scripts/pkgdelta.sh.in
+++ b/scripts/pkgdelta.sh.in
@@ -61,7 +61,7 @@ read_pkginfo()
IFS="
"
local line var val
- for line in $(bsdtar -xOf "$1" .PKGINFO 2>/dev/null |
+ for line in $(bsdtar -xOqf "$1" .PKGINFO 2>/dev/null |
grep -v "^#" | sed 's|\(\w*\)\s*=\s*\(.*\)|\1="\2"|'); do
eval "$line"
if [[ -n $pkgname && -n $pkgver && -n $arch ]]; then
@@ -136,12 +136,12 @@ fi
if [[ ! -f $1 ]]; then
error "$(gettext "File '%s' does not exist")" "$1"
- exit 0
+ exit 1
fi
if [[ ! -f $2 ]]; then
error "$(gettext "File '%s' does not exist")" "$2"
- exit 0
+ exit 1
fi
if ! type xdelta3 &>/dev/null; then