[Rt-commit] [svn] r993 - in rt/branches/rt-3.1: . bin etc lib/RT lib/t

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Tue Jun  1 15:52:47 2004
New Revision: 993

Modified:
   rt/branches/rt-3.1/   (props changed)
   rt/branches/rt-3.1/bin/rt.in
   rt/branches/rt-3.1/etc/RT_Config.pm.in
   rt/branches/rt-3.1/lib/RT/EmailParser.pm
   rt/branches/rt-3.1/lib/t/02regression.t.in
Log:
Merge forward from RT 3.0


Modified: rt/branches/rt-3.1/bin/rt.in
==============================================================================
--- rt/branches/rt-3.1/bin/rt.in	(original)
+++ rt/branches/rt-3.1/bin/rt.in	Tue Jun  1 15:52:47 2004
@@ -153,6 +153,7 @@
             foreach $title (grep $_, @titles) {
                 $help{$title} = $item->[2]{Text};
             }
+        }
     }
 
     # What does the user want help with?

Modified: rt/branches/rt-3.1/etc/RT_Config.pm.in
==============================================================================
--- rt/branches/rt-3.1/etc/RT_Config.pm.in	(original)
+++ rt/branches/rt-3.1/etc/RT_Config.pm.in	Tue Jun  1 15:52:47 2004
@@ -42,8 +42,6 @@
 
 # }}}
 
-# }}}
-
 # {{{ Database Configuration
 
 # Database driver beeing used. Case matters

Modified: rt/branches/rt-3.1/lib/RT/EmailParser.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/EmailParser.pm	(original)
+++ rt/branches/rt-3.1/lib/RT/EmailParser.pm	Tue Jun  1 15:52:47 2004
@@ -628,8 +628,7 @@
 sub _SetupMIMEParser {
     my $self   = shift;
     my $parser = shift;
-	
-    #$RT::Logger->crit(  $self->{'AttachmentDir'} );
+    
     # Set up output directory for files:
 
     my $tmpdir = File::Temp::tempdir( TMPDIR => 1, CLEANUP => 1 );

Modified: rt/branches/rt-3.1/lib/t/02regression.t.in
==============================================================================
--- rt/branches/rt-3.1/lib/t/02regression.t.in	(original)
+++ rt/branches/rt-3.1/lib/t/02regression.t.in	Tue Jun  1 15:52:47 2004
@@ -34,10 +34,12 @@
 
 
 use File::Find;
-File::Find::find({wanted => \&wanted_autogen}, 'lib/t/autogen');
+File::Find::find({wanted => \&wanted_autogen,	
+	preprocess => sub {return sort @_}}, 'lib/t/autogen');
 sub wanted_autogen { /^autogen.*\.t\z/s && require $_; }
 
-File::Find::find({wanted => \&wanted_regression}, 'lib/t/regression');
+File::Find::find({wanted => \&wanted_regression,
+	preprocess => sub {return sort @_}}, 'lib/t/regression');
 sub wanted_regression { /^*\.t\z/s && require $_; }
 
 require "@RT_LIB_PATH@/t/03web.pl";