[Pgp-tools-commit] r709 - in trunk: gpg-mailkeys gpgsigs

[Guilhem Moulin]

Author: guilhem-guest
Date: 2014-09-13 18:01:36 +0000 (Sat, 13 Sep 2014)
New Revision: 709

Modified:
   trunk/gpg-mailkeys/gpg-mailkeys
   trunk/gpgsigs/gpgsigs
Log:
wibble

Modified: trunk/gpg-mailkeys/gpg-mailkeys
===================================================================
--- trunk/gpg-mailkeys/gpg-mailkeys	2014-09-13 18:01:28 UTC (rev 708)
+++ trunk/gpg-mailkeys/gpg-mailkeys	2014-09-13 18:01:36 UTC (rev 709)
@@ -73,7 +73,7 @@
 while [ -n "$1" ]; do
 	printf "[$1] "
 	TEMPFILE=`mktemp -t gpg2mail.XXXXXX`
-	ADDR=`gpg --with-colons --fixed-list-mode --list-key $1 | sed -e 's/^uid:[^re][^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:<]*<[^:>]*>\):.*/@@uid@@ \1/' -e '/^@@uid@@ /!d' -e 's/([^)]*)//g' -e 's/  */ /g' -e 's/^@@uid@@ //' | head -1`
+	ADDR=`gpg --with-colons --fixed-list-mode --list-key $1 | sed -e 's/^uid:[^rei:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:<]*<[^:>]*>\):.*/@@uid@@ \1/' -e '/^@@uid@@ /!d' -e 's/([^)]*)//g' -e 's/  */ /g' -e 's/^@@uid@@ //' | head -1`
 	if [ -z "$ADDR" ]; then
 		printf "(no usable user ids)\n"
 		FAILKEYS="$FAILKEYS:$1"

Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs	2014-09-13 18:01:28 UTC (rev 708)
+++ trunk/gpgsigs/gpgsigs	2014-09-13 18:01:36 UTC (rev 709)
@@ -132,14 +132,13 @@
 # correct attribute size
 $gpg->options->hash_init( 'extra_args' => [ '--attribute-file', $photos,
 											qw/ --list-options show-sig-subpackets
-												--fixed-list-mode --with-colons --no-tty/ ]
+												--fixed-list-mode --with-colons/ ]
 						, 'meta_interactive' => 0 );
 
 my $stdout = IO::Handle::->new();
 my $status = IO::Handle::->new();
 my $handles = GnuPG::Handles::->new( stdout => $stdout, status => $status );
-my $pid = $gpg->wrap_call( commands => [ '--list-sigs' ], command_args => [ @mykeys, @keys ]
-						 , handles => $handles );
+my $pid = $gpg->list_sigs( handles => $handles, command_args => [ @mykeys, @keys ] );
 
 $_->blocking(0) for ($stdout, $status);
 my $output = IO::Select::->new();