diff options
| author | Ray Kohler <ataraxia937@gmail.com> | 2011-03-27 18:14:15 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-03-28 04:50:52 +0200 |
| commit | 4ef664f485559b0764271184a5305808b1a2e911 (patch) | |
| tree | 5b6be5f0c6d1e98af91797afe28306095a60f346 | |
| parent | c3ae209246804e9aebdc04c958548e340ff8998f (diff) | |
| download | pacman-4ef664f485559b0764271184a5305808b1a2e911.tar.gz pacman-4ef664f485559b0764271184a5305808b1a2e911.tar.xz | |
Create pacman keyring directory if missing
Use mode 755, so non-root users can see inside.
Add "--no-permission-warning" to GPG_PACMAN to suppress the noise that
otherwise comes of not using mode 700 - this is not private data.
GPGme turns out not to issue this warning itself, so no problem there.
TODO: should non-root users be allowed to use the read-only operations
(--list, --export, --finger)?
Signed-off-by: Ray Kohler <ataraxia937@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/pacman-key.sh.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 5746e64f..89e52fc0 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -244,7 +244,12 @@ fi if [[ GPGDIR=$(find_config "GPGDir") == 0 ]]; then PACMAN_KEYRING_DIR="${GPGDIR}" fi -GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR}" +GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning" + +# Try to create $PACMAN_KEYRING_DIR if non-existent +# Check for simple existence rather than for a directory as someone may want +# to use a symlink here +[[ -e ${PACMAN_KEYRING_DIR} ]] || mkdir -p -m 755 "${PACMAN_KEYRING_DIR}" # Parse and execute command command="$1" |