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

[interchange-core@icdevgroup.org]

User:      jon
Date:      2003-01-24 05:10:36 GMT
Modified:  scripts  Tag: STABLE_4_8-branch interchange.PL
Log:
Merge from trunk:

* Prevent test from failing during upgrade -- remove the installation
  library directories from @INC if MINIVEND_ROOT =~ blib.

Revision  Changes    Path
No                   revision



No                   revision



2.7.2.19  +9 -1      interchange/scripts/interchange.PL


rev 2.7.2.19, prev_rev 2.7.2.18
Index: interchange.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/interchange.PL,v
retrieving revision 2.7.2.18
retrieving revision 2.7.2.19
diff -u -u -r2.7.2.18 -r2.7.2.19
--- interchange.PL	26 Nov 2002 03:21:13 -0000	2.7.2.18
+++ interchange.PL	24 Jan 2003 05:10:36 -0000	2.7.2.19
@@ -50,7 +50,7 @@
 #
 # Interchange version 4.8.7
 #
-# $Id: interchange.PL,v 2.7.2.18 2002/11/26 03:21:13 jon Exp $
+# $Id: interchange.PL,v 2.7.2.19 2003/01/24 05:10:36 jon Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. and
 # Interchange Development Group, http://www.icdevgroup.org/
@@ -87,6 +87,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~_~';
@@ -2777,10 +2783,12 @@
 			unless $ENV{MINIVEND_ROOT} =~ m{/blib$};
 	}
 
+# LEGACY
 	# Kept here for compatibility
 	eval {
 		require Vend::Payment::CyberCash;
 	};
+# END LEGACY
 
 	$Vend::CyberCash = ! $@;