From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Robin H\. Johnson" Subject: [PATCH 3/9] Debugging cleanup improvements Date: Wed, 25 Apr 2007 19:37:17 -0700 Message-ID: <11775550432268-git-send-email-robbat2@gentoo.org> References: <1177555043986-git-send-email-robbat2@gentoo.org> <11775550432104-git-send-email-robbat2@gentoo.org> <1177555043272-git-send-email-robbat2@gentoo.org> Cc: Junio C Hamano , "Robin H\. Johnson" To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Apr 26 04:37:35 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HgtrS-00071Z-2F for gcvg-git@gmane.org; Thu, 26 Apr 2007 04:37:34 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932173AbXDZCh3 (ORCPT ); Wed, 25 Apr 2007 22:37:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932167AbXDZCh3 (ORCPT ); Wed, 25 Apr 2007 22:37:29 -0400 Received: from b01.ext.isohunt.com ([208.71.112.51]:56927 "EHLO mail.isohunt.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754632AbXDZCh2 (ORCPT ); Wed, 25 Apr 2007 22:37:28 -0400 Received: (qmail 15767 invoked from network); 26 Apr 2007 02:37:27 -0000 Received: from Unknown (HELO curie.orbis-terrarum.net) (24.81.201.182) (smtp-auth username robbat2@isohunt.com, mechanism login) by mail.isohunt.com (qpsmtpd/0.33-dev on beta01) with (AES256-SHA encrypted) ESMTPSA; Thu, 26 Apr 2007 02:37:27 +0000 Received: (qmail 18816 invoked from network); 25 Apr 2007 19:37:41 -0700 Received: from grubbs-int-e1000.local.orbis-terrarum.net (HELO grubbs-int.orbis-terrarum.net) (172.16.9.4) by curie-int-1.local.orbis-terrarum.net with SMTP; 25 Apr 2007 19:37:41 -0700 Received: (nullmailer pid 32449 invoked by uid 0); Thu, 26 Apr 2007 02:37:23 -0000 X-Mailer: git-send-email 1.5.2.rc0.43.g2f4c7 In-Reply-To: <1177555043272-git-send-email-robbat2@gentoo.org> Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: From: Robin H. Johnson The debug output is much more helpful if it has the parameters that were used. Pull the sendmail parameters into a seperate array for that, and also include similar data during the Net::SMTP case. Signed-off-by: Robin H. Johnson --- git-send-email.perl | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 00f8181..8af235f 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -468,15 +468,15 @@ X-Mailer: git-send-email $gitversion $header .= join("\n", @xh) . "\n"; } + my @sendmail_parameters = ('-i', map { extract_valid_address($_) } @recipients); + if ($dry_run) { # We don't want to send the email. } elsif ($smtp_server =~ m#^/#) { my $pid = open my $sm, '|-'; defined $pid or die $!; if (!$pid) { - exec($smtp_server,'-i', - map { extract_valid_address($_) } - @recipients) or die $!; + exec($smtp_server, @sendmail_parameters) or die $!; } print $sm "$header\n$message"; close $sm or die $?; @@ -496,8 +496,10 @@ X-Mailer: git-send-email $gitversion print (($dry_run ? "Dry-" : "")."OK. Log says:\nDate: $date\n"); if ($smtp) { print "Server: $smtp_server\n"; + print "MAIL FROM: $from\n"; + print "RCPT TO: ".join(',',@recipients)."\n"; } else { - print "Sendmail: $smtp_server\n"; + print "Sendmail: $smtp_server ".join(' ',@sendmail_parameters)."\n"; } print "From: $from\nSubject: $subject\nCc: $cc\nTo: $to\n\n"; if ($smtp) { -- 1.5.2.rc0.43.g2f4c7