diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2018-10-31 13:12:33 -0400 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-11-03 21:56:40 +1000 |
| commit | 3dfec574a36b6aacc2004df3e122dae9d17a4b0d (patch) | |
| tree | 1df9023add9d6bf87bd7d324a00bbd2b4cdc010e | |
| parent | 635a9c911c419932e4f27eeae349bb265011ca86 (diff) | |
| download | pacman-3dfec574a36b6aacc2004df3e122dae9d17a4b0d.tar.gz pacman-3dfec574a36b6aacc2004df3e122dae9d17a4b0d.zip | |
makepkg: fix .PKGINFO/.BUILDINFO files swallowing status printing
The respective write_* functions are low-level and shouldn't be
outputting statuses; move these to the logic flow where they are used.
This ensures the functions can be used in the future wherever, and also
solves an issue where, as fallout from the message.sh retrofitting in
commit 882e707e40bbade0111cf3bdedbdac4d4b70453b, the statuses got
redirected to the actual files.
The resulting package was technically correct, except that it contained
useless lines which pacman ignored, and repo-add also ignored but at the
same time generated an error message:
/usr/bin/repo-add: line 335: declare: `=-> Generating .PKGINFO file...': not a valid identifier
Thirdparty package tools with stricter parsers may abort with errors,
and "repose" is known to do so.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 87253883..3ac03d11 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -634,7 +634,6 @@ write_pkginfo() { merge_arch_attrs - msg2 "$(gettext "Generating %s file...")" ".PKGINFO" printf "# Generated by makepkg %s\n" "$makepkg_version" printf "# using %s\n" "$(fakeroot -v)" @@ -672,8 +671,6 @@ write_pkginfo() { } write_buildinfo() { - msg2 "$(gettext "Generating %s file...")" ".BUILDINFO" - write_kv_pair "format" "1" write_kv_pair "pkgname" "$pkgname" @@ -728,7 +725,9 @@ create_package() { msg "$(gettext "Creating package \"%s\"...")" "$pkgname" pkgarch=$(get_pkg_arch) + msg2 "$(gettext "Generating %s file...")" ".PKGINFO" write_pkginfo > .PKGINFO + msg2 "$(gettext "Generating %s file...")" ".BUILDINFO" write_buildinfo > .BUILDINFO # check for changelog/install files |