diff options
| author | Andres P <aepd87@gmail.com> | 2010-06-17 08:14:41 -0430 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2010-06-21 01:04:57 +1000 |
| commit | 34229c562571d458446c9e4da197fcae251c2f6b (patch) | |
| tree | d1408a80525f477fb12944a6d1408051a725a46d | |
| parent | 09aae4b7a5891ad738754a22f956c83911d1d9eb (diff) | |
| download | pacman-34229c562571d458446c9e4da197fcae251c2f6b.tar.xz | |
makepkg: fix variable checks when writing pkginfo
Regression caused by c71fe7db. Was checking for "optdepend" and "conflict"
rather than "optdepends" and "conflicts" when populating .PKGINFO.
Signed-off-by: Andres P <aepd87@gmail.com>
[Allan: adjust commit message]
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 678359f8..d0b8b4b7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -923,14 +923,14 @@ write_pkginfo() { echo "force = true" fi - [[ $license ]] && printf "license = %s\n" "${license[@]}" - [[ $replaces ]] && printf "replaces = %s\n" "${replaces[@]}" - [[ $groups ]] && printf "group = %s\n" "${groups[@]}" - [[ $depends ]] && printf "depend = %s\n" "${depends[@]}" - [[ $optdepend ]] && printf "optdepend = %s\n" "${optdepends[@]}" - [[ $conflict ]] && printf "conflict = %s\n" "${conflicts[@]}" - [[ $provides ]] && printf "provides = %s\n" "${provides[@]}" - [[ $backup ]] && printf "backup = %s\n" "${backup[@]}" + [[ $license ]] && printf "license = %s\n" "${license[@]}" + [[ $replaces ]] && printf "replaces = %s\n" "${replaces[@]}" + [[ $groups ]] && printf "group = %s\n" "${groups[@]}" + [[ $depends ]] && printf "depend = %s\n" "${depends[@]}" + [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]}" + [[ $conflicts ]] && printf "conflict = %s\n" "${conflicts[@]}" + [[ $provides ]] && printf "provides = %s\n" "${provides[@]}" + [[ $backup ]] && printf "backup = %s\n" "${backup[@]}" for it in "${packaging_options[@]}"; do local ret="$(check_option $it)" |