diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2014-12-14 18:35:01 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-12-18 07:33:37 +0100 |
| commit | 0cd174efd5065dca26fcce180d853fe6323d3e12 (patch) | |
| tree | 7c21768c49d8a574d380c0332525eb51b52d3b04 | |
| parent | a4b23417f9868e14fddf0e6f35e57ba05f029623 (diff) | |
| download | pacman-0cd174efd5065dca26fcce180d853fe6323d3e12.tar.gz pacman-0cd174efd5065dca26fcce180d853fe6323d3e12.tar.xz | |
makepkg: correctly add changelog files
Before this, we'd see bizzare behavior of:
-> Adding changelog file (systemd.install)...
And, changelog files in the global section would not be added at all.
The code is clearly wrong here, as it references 'install' within a
loop of 'changelog' and 'install'. Let's use parameter indirection to
ensure that the proper file is identified and added.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 771aa722..33dff245 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2367,7 +2367,7 @@ create_srcpackage() { for i in 'changelog' 'install'; do local file files - [[ $install ]] && files+=("$install") + [[ ${!i} ]] && files+=("${!i}") for name in "${pkgname[@]}"; do if extract_function_var "package_$name" "$i" 0 file; then files+=("$file") |