Changeset 30287

Show
Ignore:
Timestamp:
09.10.2015 13:24:30 (4 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)

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/parallel-building/trunk/src/perllib/FileUtils.pm

    r29243 r30287  
    3939# Configuration 
    4040my $debug = 0; 
    41 my $linking_disabled = 1; 
     41my $linking_disabled = 0; 
    4242 
    4343# Globals 
     
    556556  } 
    557557  # substitute a copy 
    558   elsif ($src_driver ne 'LocalFS') 
    559   { 
    560     if (!$done_link_warning) 
    561     { 
    562       &printWarning('Cannot symbolic link on non-local file systems - copying all files instead'); 
    563       $done_link_warning = 1; 
    564     } 
    565     &transferFiles($src_file, $dst_file, 'COPY'); 
    566   } 
    567558  else 
    568559  { 
    569     if (!$done_link_warning) 
    570     { 
    571       &printWarning('Cannot symbolic link between file systems - copying all files instead'); 
    572       $done_link_warning = 1; 
    573     } 
    574     &transferFiles($src_file, $dst_file, 'COPY'); 
     560      if (!$done_link_warning) 
     561      { 
     562      if ($src_driver ne 'LocalFS' || $dst_driver ne 'LocalFS') 
     563      { 
     564          &printWarning('Cannot symbolic hardlink between non-local file systems - copying all files instead'); 
     565      } 
     566      else 
     567      { 
     568          &printWarning('Symbolic hardlinking disabled  - copying all files instead'); 
     569      } 
     570      $done_link_warning = 1; 
     571      } 
     572      &transferFiles($src_file, $dst_file, 'COPY'); 
    575573  } 
    576574}