set Rev property

[pgp-tools.git] / caff / caff

diff --git a/caff/caff b/caff/caff
index 78f729017202d8784b2d5e1fad70bd9682265807..9fd16331453e94f7ce77316860155a6dfc6864b8 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -121,9 +121,9 @@ B<gpg> is set to.
 
 =item B<gpg-delsig> [string]
 
-Path to the GnuPG binary which is used to split off signatures.  This is
-needed while the upstream GnuPG is not fixed  (there are 2 bugs in the
-Debian Bug Tracking System).  Default: what B<gpg> is set to.
+Path to the GnuPG binary which is used to split off signatures.  This was
+needed while the upstream GnuPG was not fixed.  Default: what B<gpg>
+is set to.
 
 =item B<secret-keyring> [string]
 
@@ -491,6 +491,7 @@ if ($ARGV[0] eq '-u') {
        usage() unless scalar @ARGV >= 3;
        shift @ARGV;
        $USER = shift @ARGV;
+       $USER =~ s/^0x//i;
        unless ($USER =~ /^[A-Za-z0-9]{8,8}([A-Za-z0-9]{8})?$/) {
                print STDERR "-u $USER is not a keyid.\n";
                usage();
@@ -498,6 +499,7 @@ if ($ARGV[0] eq '-u') {
        $USER = uc($USER);
 };
 for my $keyid (@ARGV) {
+       $keyid =~ s/^0x//i;
        unless ($keyid =~ /^[A-Za-z0-9]{8}([A-Za-z0-9]{8})?$/) {
                print STDERR "$keyid is not a keyid.\n";
                usage();
@@ -525,7 +527,6 @@ for my $keyid (@ARGV) {
                warn ("No data from gpg for list-key\n");
                next;
        };
-       print $stdout;
        foreach my $keyid (@{$CONFIG{'keyid'}}) {
                unless ($stdout =~ /^pub:(?:[^:]*:){3,3}$keyid:/m) {
                        info("Importing $keyid");