Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=9c55eba19b8722f4a10ebb7c14ba3375f1d9e44f
commit 9c55eba19b8722f4a10ebb7c14ba3375f1d9e44f Author: DeX77 <[email protected]> Date: Mon Sep 28 15:26:12 2015 +0200 * killall gpg components _in_ chroot diff --git a/scripts/makepkg b/scripts/makepkg index 011b78e..dc4e618 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -832,8 +832,6 @@ makepkg_init() { } chroot_umount() { - msg "Kill dirmngr if it is running" - gpgconf --kill dirmngr msg "Attempting to umount chroot directories..." umount $CHROOTDIR/proc >/dev/null umount $CHROOTDIR/sys >/dev/null @@ -1906,6 +1904,13 @@ if [ "$GENSHA1" = "0" ]; then msg "Importing $pkgname.key" gpg --import $startdir/$pkgname.key fi + msg "Killing all gpg components" + gpgconf --kill gpg + gpgconf --kill gpg-agent + gpgconf --kill scdaemon + gpgconf --kill gpgsm + gpgconf --kill dirmngr + gpgconf --kill pinentry msg "Validating source files with gpg" errors=0 idx=0 @@ -1936,6 +1941,13 @@ if [ "$GENSHA1" = "0" ]; then fi idx=$(($idx+1)) done + msg "Killing all gpg components" + gpgconf --kill gpg + gpgconf --kill gpg-agent + gpgconf --kill scdaemon + gpgconf --kill gpgsm + gpgconf --kill dirmngr + gpgconf --kill pinentry if [ $errors -gt 0 ]; then error "One or more files did not pass the validity check!" return 1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
