From: David Mitchell <davem@iabyn.com>
Date: Mon, 7 Jun 2010 23:08:19 +0000 (+0100)
Subject: perlbug: always allow change of sender address
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e6eb90205a8cd8f42cd4d1226ea369f3ff1a14ae;p=p5sagit%2Fp5-mst-13.2.git

perlbug: always allow change of sender address

The code that guessed a default sender address would under some
circumstances not display this guess to the user with the option to change
it. Specifically, if $Config{cf_me} eq {login id of the user running
perlbug}.

In my case, cf_email got set at build time (Configure default) of
'davem@pigeon.(none)', which was then silently used. Not good!
---

diff --git a/utils/perlbug.PL b/utils/perlbug.PL
index 77ef3bd..38f2b3b 100644
--- a/utils/perlbug.PL
+++ b/utils/perlbug.PL
@@ -456,11 +456,12 @@ EOF
     }
 
     # Prompt for return address, if needed
-    unless ($from) {
+    unless ($::opt_r) {
 	# Try and guess return address
 	my $guess;
 
-	$guess = $ENV{'REPLY-TO'} || $ENV{'REPLYTO'} || $ENV{'EMAIL'} || '';
+	$guess = $ENV{'REPLY-TO'} || $ENV{'REPLYTO'} || $ENV{'EMAIL'}
+	    || $from || '';
         if ($Is_MacOS) {
             require Mac::InternetConfig;
             $guess = $Mac::InternetConfig::InternetConfig{