[Pkg-gnupg-commit] [gnupg2] 01/08: add some import-options for better migration

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit b64a77add7ae19cefaf3cb4e417460d252fad12e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Nov 8 19:25:27 2016 -0600

    add some import-options for better migration
---
 debian/migrate-pubring-from-classic-gpg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/migrate-pubring-from-classic-gpg b/debian/migrate-pubring-from-classic-gpg
index d560e38..13ee1f8 100755
--- a/debian/migrate-pubring-from-classic-gpg
+++ b/debian/migrate-pubring-from-classic-gpg
@@ -64,7 +64,7 @@ printf 'Migrating from:\n%s\n[Backing up to %s]\n' "$(ls -l "$GHD/pubring.gpg")"
 
 "$GPG" --export-ownertrust > "$BACKUP/ownertrust.txt"
 mv "$GHD/pubring.gpg" "$BACKUP/"
-"$GPG" --import < "$BACKUP/pubring.gpg"
+"$GPG" --import-options import-local-sigs,keep-ownertrust,repair-pks-subkey-bug --import < "$BACKUP/pubring.gpg"
 "$GPG" --import-ownertrust < "$BACKUP/ownertrust.txt"
 "$GPG" --check-trustdb
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git