- Timestamp:
- 2013-05-27T12:50:19+12:00 (11 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/buildcolutils.pm
r27392 r27482 273 273 } 274 274 # End Mod 275 $self->{'archivedir'} =~ s/[\\\/]+/\//g; 276 $self->{'archivedir'} =~ s/\/$//; 275 $self->{'archivedir'} = &FileUtils::sanitizePath($self->{'archivedir'}); 276 #$self->{'archivedir'} =~ s/[\\\/]+/\//g; 277 #$self->{'archivedir'} =~ s/\/$//; 277 278 278 279 # - resolve (and possibly set to default) builddir … … 290 291 } 291 292 # - why don't we make builddir absolute similar to archivedir? 292 $self->{'builddir'} =~ s/[\\\/]+/\//g; 293 $self->{'builddir'} =~ s/\/$//; 293 $self->{'builddir'} = &FileUtils::sanitizePath($self->{'builddir'}); 294 #$self->{'builddir'} =~ s/[\\\/]+/\//g; 295 #$self->{'builddir'} =~ s/\/$//; 294 296 295 297 if (defined $collectcfg->{'cachedir'} && $self->{'cachedir'} eq "") -
main/trunk/greenstone2/perllib/inexport.pm
r27394 r27482 274 274 } 275 275 276 # @todo &FileUtils::sanitizePath($archivedir) [jmt12]277 $archivedir =~ s/[\\\/]+/\//g;278 $archivedir =~ s/\/$//;276 $archivedir = &FileUtils::sanitizePath($archivedir) 277 #$archivedir =~ s/[\\\/]+/\//g; 278 #$archivedir =~ s/\/$//; 279 279 $self->{'archivedir'} = $archivedir; 280 280 … … 441 441 } 442 442 443 $self->{'manifest'} =~ s/[\\\/]+/\//g; 444 $self->{'manifest'} =~ s/\/$//; 443 $self->{'manifest'} = &FileUtils::sanitizePath($self->{'manifest'}); 444 #$self->{'manifest'} =~ s/[\\\/]+/\//g; 445 #$self->{'manifest'} =~ s/\/$//; 445 446 446 447 $manifest_lookup->parse($manifest_filename);
Note:
See TracChangeset
for help on using the changeset viewer.