From: Graham Knop <haarg@haarg.org>
Date: Tue, 19 Nov 2013 10:19:15 +0000 (-0500)
Subject: move win32 path shortening back to correct location
X-Git-Tag: v2.000_000~35
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2Flocal-lib.git;a=commitdiff_plain;h=b209481c24d95e8751eed4b50ec312fc894e1fa8

move win32 path shortening back to correct location
---

diff --git a/lib/local/lib.pm b/lib/local/lib.pm
index d65df50..f5e4778 100644
--- a/lib/local/lib.pm
+++ b/lib/local/lib.pm
@@ -227,6 +227,9 @@ sub activate {
   $self->ensure_dir_structure_for($path)
     unless $self->no_create;
 
+  $path = ( Win32::GetShortPathName($path) || $path )
+    if $^O eq 'MSWin32';
+
   my @active_lls = $self->active_paths;
 
   if (grep { $_ eq $path } @active_lls) {
@@ -416,9 +419,6 @@ sub resolve_path {
     resolve_empty_path
   )}($path);
 
-  $path = Win32::GetShortPathName($path)
-    if $^O eq 'MSWin32';
-
   $path;
 }