From 9596321736dd63f15fa57f40e0fee8bbf2adb06c Mon Sep 17 00:00:00 2001
From: flz <flz@FreeBSD.org>
Date: Wed, 11 Jan 2006 16:22:24 +0000
Subject: - Fix another bug, it seems sometimes mail is sent to cvs-all but not
 cvs-ports.

Approved by:	ssouhlal (implicit)
---
 tools/tools/mfc/mfc.pl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/tools/mfc/mfc.pl b/tools/tools/mfc/mfc.pl
index a972a04..69d39e6 100644
--- a/tools/tools/mfc/mfc.pl
+++ b/tools/tools/mfc/mfc.pl
@@ -56,7 +56,7 @@ my $mfchome = $MFCHOME ? $MFCHOME : "/var/tmp/mfc";
 my $mfclogin = $MFCLOGIN ? $MFCLOGIN : "";
 my $cvsroot = $MFCCVSROOT ? $MFCCVSROOT : ':pserver:anoncvs@anoncvs.at.FreeBSD.org:/home/ncvs';
 
-my $version = "0.4.1";
+my $version = "0.4.2";
 my %opt;
 my $commit_author;
 my $commit_date;
@@ -146,7 +146,7 @@ sub fetch_mail($)
 
 	# XXX - This should go away once my mid.cgi patches hits the doc tree.
 	foreach (@years) {
-		$url = `fetch -q -o - 'http://www.freebsd.org/cgi/mid.cgi?id=$msgid+$_/cvs-all&db=mid' | grep getmsg.cgi`;
+		$url = `fetch -q -o - 'http://www.freebsd.org/cgi/mid.cgi?id=$msgid+$_/cvs-all&db=mid' | grep getmsg.cgi | head -n 1`;
 		last if (!($url =~ /^$/));
 	}
 	if ($url =~ /^$/) {
@@ -154,7 +154,8 @@ sub fetch_mail($)
 		exit 1;
 	}
 	$url =~ s/.*HREF="(.*)".*/$1+raw/;
-	$url =~ s/hub.freebsd.org/www.freebsd.org/;
+	$url =~ s/.*href="(.*)".*/$1/;
+	$url =~ s/^.*\/cgi/http:\/\/www.freebsd.org\/cgi/;
 	return $url;
 }
 
@@ -254,7 +255,7 @@ if ($opt{s}) {
 	print "Searching commit mail on www.freebsd.org...\n";
 	$commiturl = search_mail($opt{s});
 	print "Fetching commit mail from www.freebsd.org...\n";
-	@commitmail = `fetch -q -o - $commiturl`;
+	@commitmail = `fetch -q -o - '$commiturl'`;
 } elsif ($opt{f}) {
 	open MAIL, $opt{f} || die "Can't open $opt{f} for reading.";
 	@commitmail = <MAIL>;	
-- 
cgit v1.1