[Pgp-tools-commit] r815 - in trunk: debian gpglist

[Guilhem Moulin]

Author: guilhem-guest
Date: 2015-08-24 12:48:56 +0000 (Mon, 24 Aug 2015)
New Revision: 815

Modified:
   trunk/debian/changelog
   trunk/gpglist/gpglist
Log:
Don't prune revoked UIDs with a subsequent selfsig.

Closes: #796664.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2015-08-08 14:36:33 UTC (rev 814)
+++ trunk/debian/changelog	2015-08-24 12:48:56 UTC (rev 815)
@@ -1,3 +1,10 @@
+signing-party (2.2-1) UNRELEASED; urgency=low
+
+  * gpglist:
+    + Don't prune revoked UIDs with a subsequent selfsig.  (Closes: #796664)
+
+ -- Guilhem Moulin <guilhem at guilhem.org>  Mon, 24 Aug 2015 13:39:59 +0200
+
 signing-party (2.1-1) unstable; urgency=low
 
   * caff:

Modified: trunk/gpglist/gpglist
===================================================================
--- trunk/gpglist/gpglist	2015-08-08 14:36:33 UTC (rev 814)
+++ trunk/gpglist/gpglist	2015-08-24 12:48:56 UTC (rev 815)
@@ -135,13 +135,13 @@
 close SIGS;
 
 # XXX: Add an option for this
- at uids = grep { !defined $revs{$longkey}->{$_} } @uids;
+ at uids = grep { !defined $revs{$longkey}->{$_} or $revs{$longkey}->{$_} < $sigs{$longkey}->{$_} } @uids;
 
 for ( my $a=0; $a <= $#uids; $a++ ) {
 	printf "|  " x $a
 	     . "+--"
 	     . "---" x ($#uids-$a)
-	     . (defined $revs{$longkey}->{$uids[$a]} ? "R" : " ") # revuid
+	     . " "
 	     . "%2i $uids{$uids[$a]}\n", $a+1;
 }