From 7a654cec91aa009bb055b4ce15c5602f43c63120 Mon Sep 17 00:00:00 2001 From: weasel Date: Fri, 26 Aug 2005 22:47:29 +0000 Subject: [PATCH] If Myon's magic to find stuff to build a ~/.caffrc fails, still produce something that can be used as a starting point git-svn-id: svn://svn.debian.org/pgp-tools/trunk@238 b513b33f-fedd-0310-b452-c3deb5f4c849 --- caff/caff | 63 ++++++++++++++++++++++++++++++------------------ debian/changelog | 8 ++++-- 2 files changed, 46 insertions(+), 25 deletions(-) diff --git a/caff/caff b/caff/caff index 3520175..8c9b105 100755 --- a/caff/caff +++ b/caff/caff @@ -308,32 +308,44 @@ sub trace2($) { sub generate_config() { - die "Error: \$LOGNAME is not set.\n" unless $ENV{LOGNAME}; - my $gecos = (getpwnam($ENV{LOGNAME}))[6]; - $gecos =~ s/,.*//; + notice("Error: \$LOGNAME is not set.\n") unless defined $ENV{'LOGNAME'}; + my $gecos = defined $ENV{'LOGNAME'} ? (getpwnam($ENV{LOGNAME}))[6] : undef; + my $email; + my @keys; + my $hostname = `hostname -f`; + chomp $hostname; + if (defined $gecos) { + $gecos =~ s/,.*//; - my $gpg = GnuPG::Interface->new(); - $gpg->call( 'gpg' ); - $gpg->options->hash_init( - 'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always --with-colons --fixed-list-mode } ] ); - $gpg->options->meta_interactive( 0 ); - my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds(); - my $pid = $gpg->list_public_keys(handles => $handles, command_args => [ $gecos ]); - my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd); - waitpid $pid, 0; + my $gpg = GnuPG::Interface->new(); + $gpg->call( 'gpg' ); + $gpg->options->hash_init( + 'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always --with-colons --fixed-list-mode } ] ); + $gpg->options->meta_interactive( 0 ); + my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds(); + my $pid = $gpg->list_public_keys(handles => $handles, command_args => [ $gecos ]); + my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd); + waitpid $pid, 0; - if ($stdout eq '') { - warn ("No data from gpg for list-key\n"); # There should be at least 'tru:' everywhere. - }; + if ($stdout eq '') { + warn ("No data from gpg for list-key\n"); # There should be at least 'tru:' everywhere. + }; - my @keys; - unless (@keys = ($stdout =~ /^pub:[^r:]*:(?:[^:]*:){2,2}([^:]+):/mg)) { - die "Error: No keys were found using \"gpg --list-public-keys '$gecos'\".\n"; - } - unless ($stdout =~ /^uid:.*<(.+@.+)>.*:/m) { - die "Error: No email address was found using \"gpg --list-public-keys '$gecos'\".\n"; - } - my $email = $1; + @keys = ($stdout =~ /^pub:[^r:]*:(?:[^:]*:){2,2}([^:]+):/mg); + unless (scalar @keys) { + info("Error: No keys were found using \"gpg --list-public-keys '$gecos'\"."); + @keys = qw{0123456789abcdef 89abcdef76543210} + } + ($email) = ($stdout =~ /^uid:.*<(.+?@.+?)>.*:/m); + unless (defined $email) { + info("Error: No email address was found using \"gpg --list-public-keys '$gecos'\"."); + $email = $ENV{'LOGNAME'}.'@'.$hostname; + } + } else { + $gecos = 'Unknown Caff User'; + $email = $ENV{'LOGNAME'}.'@'.$hostname; + @keys = qw{0123456789abcdef 89abcdef76543210} + }; return < Tue, 23 Aug 2005 01:55:09 +0200 + -- Peter Palfrader Sat, 27 Aug 2005 00:43:27 +0200 signing-party (0.4.3-1) unstable; urgency=low -- 2.39.5