[interchange-cvs] interchange - heins modified scripts/interchange.PL

[interchange-core@icdevgroup.org]

User:      heins
Date:      2002-10-25 01:49:36 GMT
Modified:  scripts  interchange.PL
Log:
* Prevent test from failing during upgrade -- remove the installation
  library directories from @INC if MINIVEND_ROOT =~ blib.

Revision  Changes    Path
2.60      +9 -1      interchange/scripts/interchange.PL


rev 2.60, prev_rev 2.59
Index: interchange.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/interchange.PL,v
retrieving revision 2.59
retrieving revision 2.60
diff -u -r2.59 -r2.60
--- interchange.PL	16 Sep 2002 23:06:33 -0000	2.59
+++ interchange.PL	25 Oct 2002 01:49:36 -0000	2.60
@@ -3,7 +3,7 @@
 #
 # Interchange version 4.9.3
 #
-# $Id: interchange.PL,v 2.59 2002/09/16 23:06:33 mheins Exp $
+# $Id: interchange.PL,v 2.60 2002/10/25 01:49:36 mheins Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. and others.
 # http://www.icdevgroup.org/
@@ -40,6 +40,12 @@
 	
 	($Global::VendRoot = $ENV{MINIVEND_ROOT})
 		if defined $ENV{MINIVEND_ROOT};
+
+	## This should only happen in "make test"
+	if($Global::VendRoot =~ m{/blib$}) {
+		shift @INC;
+		shift @INC;
+	}
 	
 	$Global::VendRoot = $Global::VendRoot || '/usr/local/interchange';
 #	$Global::VendRoot = $Global::VendRoot || '~_~INSTALLARCHLIB~_~';
@@ -769,10 +775,12 @@
 			unless $ENV{MINIVEND_ROOT} =~ m{/blib$};
 	}
 
+# LEGACY
 	# Kept here for compatibility
 	eval {
 		require Vend::Payment::CyberCash;
 	};
+# END LEGACY
 
 	# These modules no longer necessary, why take up memory?
 	delete $INC{'Getopt/Long.pm'};