fix uncaught exception during pacman keyring prep
Merge remote-tracking branch 'github/master' into github