[interchange-cvs] interchange - jonc modified lib/Vend/Util.pm

[interchange-cvs at icdevgroup.org]

User:      jonc
Date:      2005-01-31 21:40:35 GMT
Modified:  lib/Vend Util.pm
Log:
Fix / simplify regexes.

Revision  Changes    Path
2.79      +4 -4      interchange/lib/Vend/Util.pm


rev 2.79, prev_rev 2.78
Index: Util.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Util.pm,v
retrieving revision 2.78
retrieving revision 2.79
diff -u -r2.78 -r2.79
--- Util.pm	30 Jan 2005 14:43:29 -0000	2.78
+++ Util.pm	31 Jan 2005 21:40:35 -0000	2.79
@@ -1,6 +1,6 @@
 # Vend::Util - Interchange utility functions
 #
-# $Id: Util.pm,v 2.78 2005/01/30 14:43:29 jonc Exp $
+# $Id: Util.pm,v 2.79 2005/01/31 21:40:35 jonc Exp $
 # 
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -87,7 +87,7 @@
 use Vend::File;
 use subs qw(logError logGlobal);
 use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION = substr(q$Revision: 2.78 $, 10);
+$VERSION = substr(q$Revision: 2.79 $, 10);
 
 my $Eval_routine;
 my $Eval_routine_file;
@@ -1892,8 +1892,8 @@
 			next unless /^From:\s*(\S.+)$/mi;
 			$from = $1;
 		}
-		push @extra_headers, "From: $from" unless (grep /^From:\s*(\S.+)$/i, @extra_headers);
-		push @extra_headers, 'Date: ' . POSIX::strftime('%a, %d %b %y %H:%M:%S %Z', localtime(time())) unless (grep /^Date:\s*.$/i, @extra_headers);
+		push @extra_headers, "From: $from" unless (grep /^From:\s/i, @extra_headers);
+		push @extra_headers, 'Date: ' . POSIX::strftime('%a, %d %b %y %H:%M:%S %Z', localtime(time())) unless (grep /^Date:\s/i, @extra_headers);
 
 		my $mime = '';
 		$mime = Vend::Interpolate::mime('header', {}, '') if $use_mime;