Changeset 27569 for gs2-extensions/parallel-building

Timestamp:

2013-06-07T10:48:39+12:00 (11 years ago)

Author:

jmt12

Message:

Trying to streamline the error messages from failing to link (otherwise I get a zillion messages about being unable to link from /tmp to /share as they are different physical media, for instance)

File:

• gs2-extensions/parallel-building/trunk/src/perllib/FileUtils/LocalFS.pm (modified) (2 diffs)

gs2-extensions/parallel-building/trunk/src/perllib/FileUtils/LocalFS.pm

@@ -28 +28 @@
 # Pragma
 use strict;
+
+
+# Globals
+my $paths_we_cannot_link_from = {};
 
 
@@ -193 +197 @@
   }
 
+  my $error_message = ucfirst(lc($mode)) . ' link failed';
   if ($ENV{'GSDLOS'} =~ /^windows$/i)
   {
     # symlink not supported on windows
-    &FileUtils::printWarning('Symlink not supported on windows');
+    $error_message = 'Symlink not supported on windows';
   }
   elsif ($mode eq 'HARD')
   {
-    if (!eval {link($src, $dest)})
-    {
-      &FileUtils::printWarning('Unable to create hard link: ' . $dest);
-    }
+    link($src, $dest);
+    #if (!eval {link($src, $dest)})
+    #{
+    #  &FileUtils::printWarning('Unable to create hard link: ' . $dest);
+    #}
   }
   elsif ($mode eq 'SOFT')
   {
-    if (!eval {symlink($src, $dest)})
-    {
-      &FileUtils::printWarning('Unable to create soft link: ' . $src);
-    }
+    symlink($src, $dest);
+    #if (!eval {symlink($src, $dest)})
+    #{
+    #  &FileUtils::printWarning('Unable to create soft link: ' . $src);
+    #}
   }
   else
   {
-    &FileUtils::printError('Unknown mode requested: ' . $mode);
+    $error_message = 'Unknown mode requested: ' . $mode;
   }
   if (!-e $dest)
   {
-    &FileUtils::printWarning('linkFile', 'Link failed. Attempting to copy instead.');
+    # Determine the top source path
+    my ($src_root) = $src =~ /^([a-z]:\\|\/[^\/]+)/i;
+    # If we haven't warned about this yet, warn now and record that we've
+    # warned. I want to let the user know what has happened, but without
+    # bombarding them with a thousand warning messages...
+    if (!defined $paths_we_cannot_link_from->{$src_root})
+    {
+      &FileUtils::printWarning($error_message . '. Will attempt to copy from: ' . $src_root);
+      $paths_we_cannot_link_from->{$src_root} = 1;
+    }
     &File::Copy::copy ($src, $dest);
   }