Changeset 10860 for branches/Release01x01/CompareRevisionsAddOn/bin/compare

Timestamp:

02/28/11 20:46:00 (2 years ago)

Author:

KennethLavrsen

Message:

Item9983: Reverting the fix that is claimed to be unsafe in persistant environment
I have to revert it manually as other fixes were in the checkin. Taking 2-3 files at a time.
If someone have negative feelings about this then I can only say that this urgent bug has been
unattented since xmas 2010 and it is time to get 1.1.3 out. I will only revert on Release01x01 branch and leave it in trunk

File:

• branches/Release01x01/CompareRevisionsAddOn/bin/compare (modified) (2 diffs)

branches/Release01x01/CompareRevisionsAddOn/bin/compare

@@ -3 +3 @@
 use strict;
 use warnings;
-
-use File::Spec;
-use FindBin qw( $Bin $Script );
 
 BEGIN {
@@ -18 +15 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
-    my @path = File::Spec->splitpath($Bin);
-    my $setlib = File::Spec->catfile( @path, 'setlib.cfg' );
-    require $setlib;
-    $Script =~ s/\..*$//;    # Remove optional file extension
-    $ENV{FOSWIKI_ACTION} = $Script;
+    $ENV{FOSWIKI_ACTION} = 'compare';
+    @INC = ( '.', grep { $_ ne '.' } @INC );
+    require 'setlib.cfg';
 }