Message ID | 20191028152218.145141-1-list@eworm.de |
---|---|
State | Rejected, archived |
Headers | show |
Series | [pacman-dev,1/1] makepkg: send output from clean_up to stderr | expand |
On 10/28/19 11:22 AM, Christian Hesse wrote: > From: Christian Hesse <mail@eworm.de> > > This is required when redirecting checksums to PKGBUILD: > > makepkg --clean --geninteg >> PKGBUILD Why would anyone ever use --clean and --geninteg in the same run? We should make sure they cannot do that, rather than changing where the output of makepkg --clean *without* --geninteg is sent. > --- > scripts/makepkg.sh.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in > index 183e1a3e..3017f31b 100644 > --- a/scripts/makepkg.sh.in > +++ b/scripts/makepkg.sh.in > @@ -1101,7 +1101,7 @@ while [[ $1 ]]; do > done > > # setup signal traps > -trap 'clean_up' 0 > +trap 'clean_up >&2' 0 > for signal in TERM HUP QUIT; do > trap "trap_exit $signal \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal" > done >
Eli Schwartz <eschwartz@archlinux.org> on Mon, 2019/10/28 11:31: > On 10/28/19 11:22 AM, Christian Hesse wrote: > > From: Christian Hesse <mail@eworm.de> > > > > This is required when redirecting checksums to PKGBUILD: > > > > makepkg --clean --geninteg >> PKGBUILD > > Why would anyone ever use --clean and --geninteg in the same run? Found this in a really old script... Not sure why I did that. > We > should make sure they cannot do that, rather than changing where the > output of makepkg --clean *without* --geninteg is sent. Fine with me. :)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 183e1a3e..3017f31b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1101,7 +1101,7 @@ while [[ $1 ]]; do done # setup signal traps -trap 'clean_up' 0 +trap 'clean_up >&2' 0 for signal in TERM HUP QUIT; do trap "trap_exit $signal \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal" done