moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-02-28 17:31:52 -05:00
Code Issues Releases Wiki Activity

pkgdelta: fix improper passing of file argument

Browse Source 
Looks like I hosed this pretty hard in 5a5e712c749edb8.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Dave Reisner 2013-03-09 22:45:00 -05:00 committed by Allan McRae
parent 63f04177c3
commit 6c870953c5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/pkgdelta.sh.in
View File

@ -75,6 +75,7 @@ isnumeric() {
} }
read_pkginfo() { read_pkginfo() {
unset pkgver pkgname arch
while IFS='=' read -r field value; do while IFS='=' read -r field value; do
# skip comments and invalid lines # skip comments and invalid lines
[[ $field = '#'* || -z $value ]] && continue [[ $field = '#'* || -z $value ]] && continue
@ -82,10 +83,10 @@ read_pkginfo() {
# skip lines which aren't fields we care about # skip lines which aren't fields we care about
[[ $field != @(pkgver|pkgname|arch) ]] || continue [[ $field != @(pkgver|pkgname|arch) ]] || continue
declare "$field=$value" declare -g "${field% }=${value# }"
[[ $pkgname && $pkgver && $arch ]] && return 0 [[ $pkgname && $pkgver && $arch ]] && return 0
done done < <(bsdtar -xOqf "$1" .PKGINFO 2>/dev/null)
error "$(gettext "Invalid package file '%s'.")" "$1" error "$(gettext "Invalid package file '%s'.")" "$1"
return 1 return 1