Changeset 27334

Show
Ignore:
Timestamp:
14.05.2013 15:44:52 (6 years ago)
Author:
kjdon
Message:

2 bugfixes that broke the building process.

Location:
main/trunk/greenstone2/perllib
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/classify.pm

    r27303 r27334  
    101101    # wise we risk clobbering classifier inheritence implied by order of paths 
    102102    # in INC [jmt12] 
    103     my $inc_paths = join(':',@INC); 
    104     if ($inc_paths !~ /$colclassdir/) 
     103    my $inc_paths = join(':',@INC);  
     104     
     105    $colclassdir = &FileUtils::filenameConcatenate($colclassdir); # no mix of / and \ slashes, only OS-specific slash 
     106    $colclassdir = &util::filename_to_regex($colclassdir); # to regex protect windows filepaths  
     107    # Normalise slashes in INC filepaths: ensure it has slashes going the same way as $colclassdir 
     108    # and further doesn't have a mix of / and \ slashes. 
     109    $inc_paths = &FileUtils::filenameConcatenate($inc_paths);  
     110    print STDERR "**** INC: $colclassdir | $inc_paths\n"; 
     111    if ($inc_paths !~ m@$colclassdir@) 
    105112    { 
    106113      unshift (@INC, $colclassdir); 
  • main/trunk/greenstone2/perllib/inexport.pm

    r27302 r27334  
    476476    if (&FileUtils::directoryExists($tmpdir)) { 
    477477        &gsprintf($out, "{import.removing_tmpdir}\n"); 
    478         &FileUtils::removeFileRecursive($tmpdir); 
     478        &FileUtils::removeFilesRecursive($tmpdir); 
    479479    } 
    480480    }