From: Graham Knop <haarg@haarg.org>
Date: Sat, 12 Oct 2013 09:10:20 +0000 (-0400)
Subject: remove support for build_environment_vars_for's deactivate option
X-Git-Tag: v2.000_000~43
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2Flocal-lib.git;a=commitdiff_plain;h=42c7045899d0144c1942b7873fbbb172940c96ae

remove support for build_environment_vars_for's deactivate option

When the deactivate option was added, it changed the signature of the
build_environment_vars_for method incompatibly.  This broke the CPAN.pm
bootstrapping process.  The deactivate option doesn't appear to be used
anywhere on CPAN except in error.

Since we don't need the interpolate option anymore, we can just ignore
any extra parameters.  This will fix CPAN.pm.
---

diff --git a/lib/local/lib.pm b/lib/local/lib.pm
index 78229ad..9943542 100644
--- a/lib/local/lib.pm
+++ b/lib/local/lib.pm
@@ -241,9 +241,11 @@ sub activate {
 }
 
 sub _legacy {
-  my ($self, $path, $deactivating) = @_;
+  my ($self, $path) = @_;
   $self = $self->new unless ref $self;
-  $self = $self->${\($deactivating ? 'deactivate' : 'activate')}($path) if defined $path;
+  if (defined $path) {
+    $self = $self->activate($path);
+  }
   $self;
 }