[Pgp-tools-commit] r758 - trunk/caff

Guilhem Moulin guilhem-guest at moszumanska.debian.org
Tue Jan 13 21:36:10 UTC 2015


Author: guilhem-guest
Date: 2015-01-13 21:36:10 +0000 (Tue, 13 Jan 2015)
New Revision: 758

Modified:
   trunk/caff/caff
Log:
caff: copy pubring.kbx, the default pubring for gnupg >= 2.1.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2015-01-13 21:36:03 UTC (rev 757)
+++ trunk/caff/caff	2015-01-13 21:36:10 UTC (rev 758)
@@ -1592,7 +1592,9 @@
 		# copy pubring to temporary gpghome
 		###################################
 		my $uiddir = File::Temp->newdir( "caff-$keyid-$uid_number-XXXXX", TMPDIR => 1 );
-		copy("$keydir/pubring.gpg", "$uiddir/pubring.gpg");
+		foreach (qw/pubring.gpg pubring.kbx/) {
+			copy($keydir.'/'.$_, $uiddir.'/'.$_) if -e $keydir.'/'.$_;
+		}
 
 		# prune it
 		##########




More information about the Pgp-tools-commit mailing list