cvs: CVSROOT / checkoutlist loginfo.pl

jimw Tue Oct 16 22:01:03 2001 EDT Modified files: /CVSROOT checkoutlist loginfo.pl Log: simpler format for cvsusers file, pulled from database and not under cvs control any more Index: CVSROOT/checkoutlist diff -u CVSROOT/checkoutlist:1.7 CVSROOT/checkoutlist:1.8 --- CVSROOT/checkoutlist:1.7 Fri Jan 12 16:52:14 2001 +++ CVSROOT/checkoutlist Tue Oct 16 22:00:59 2001 @@ -1,5 +1,5 @@ # -#ident "@(#)cvs/examples:$Name: $:$Id: checkoutlist,v 1.7 2001/01/12 21:52:14 jimw Exp $" +#ident "@(#)cvs/examples:$Name: $:$Id: checkoutlist,v 1.8 2001/10/17 02:00:59 jimw Exp $" # # The "checkoutlist" file is used to support additional version controlled # administrative files in $CVSROOT/CVSROOT, such as template files. @@ -20,7 +20,6 @@ #unwrap commitinfo.pl loginfo.pl -cvsusers dolog.pl gen_acl_file.m4 gen_ext_sapi_list.sh Index: CVSROOT/loginfo.pl diff -u CVSROOT/loginfo.pl:1.53 CVSROOT/loginfo.pl:1.54 --- CVSROOT/loginfo.pl:1.53 Fri Sep 7 20:38:36 2001 +++ CVSROOT/loginfo.pl Tue Oct 16 22:00:59 2001 @@ -168,23 +168,18 @@ my $msgid = "Message-ID: <cvs$cvsuser".time()."\@cvsserver>\n"; -my %handles; +my $from; if (open FD, $cvsusers) { while(<FD>) { chop; - if (/^([a-z_]{2,}?)\s(.*)\s+([a-z0-9-\._]+@[a-z0-9-\.]+).*$/i) { - $handles{$1} = [trim($2), trim($3)]; + if (m/^$cvsuser:(.+?):(.+)$/) { + $from = "\"$1\" <$2>"; } } close(FD); } -my $from; -if(defined($handles{$cvsuser})) { - $from = "\"".$handles{$cvsuser}[0]."\" <".$handles{$cvsuser}[1].">"; -} else { - $from = "$cvsuser <$mailfrom>"; -} +$from ||= "$cvsuser <$mailfrom>"; # "Reply-to: $mailto\n". # "Date: ".localtime()."\n".