Changeset 30287

Timestamp:

2015-10-09T13:24:30+13:00 (9 years ago)

Author:

jmt12

Message:

Extending error messages a bit to differentiate between linking that failed and linking that has been disabled (for testing purposes)

File:

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

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

@@ -39 +39 @@
 # Configuration
 my $debug = 0;
-my $linking_disabled = 1;
+my $linking_disabled = 0;
 
 # Globals
@@ -556 +556 @@
   }
   # substitute a copy
-  elsif ($src_driver ne 'LocalFS')
-  {
-    if (!$done_link_warning)
-    {
-      &printWarning('Cannot symbolic link on non-local file systems - copying all files instead');
-      $done_link_warning = 1;
-    }
-    &transferFiles($src_file, $dst_file, 'COPY');
-  }
   else
   {
-    if (!$done_link_warning)
-    {
-      &printWarning('Cannot symbolic link between file systems - copying all files instead');
-      $done_link_warning = 1;
-    }
-    &transferFiles($src_file, $dst_file, 'COPY');
+      if (!$done_link_warning)
+      {
+      if ($src_driver ne 'LocalFS' || $dst_driver ne 'LocalFS')
+      {
+          &printWarning('Cannot symbolic hardlink between non-local file systems - copying all files instead');
+      }
+      else
+      {
+          &printWarning('Symbolic hardlinking disabled  - copying all files instead');
+      }
+      $done_link_warning = 1;
+      }
+      &transferFiles($src_file, $dst_file, 'COPY');
   }
 }