Show
Ignore:
Timestamp:
19.06.2013 15:36:31 (6 years ago)
Author:
sjm84
Message:

1. Undoing one of the commits made yesterday because 2013.06 matches the regex on GS version 3.06. The solution for naming the dec caused problems when naming the caveats. So reverting to the earlier code. 2. Correcting a test in lib.pl.

Location:
other-projects/nightly-tasks/snapshot/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/snapshot/trunk/lib.pl

    r21886 r27661  
    9595 
    9696    #copy products to a temporary folder, giving them their new names 
    97     if ( ! -d "$release_dir${sep}uploads" ) { 
     97    if ( -d "$release_dir${sep}uploads" ) { 
    9898        system( "rm -rf '$release_dir${sep}uploads'" ); 
    9999    } 
  • other-projects/nightly-tasks/snapshot/trunk/task.pl

    r27655 r27661  
    7979     
    8080    #change the filenames to have the date in them 
    81     $ENV{'munges'} = "s/\D$ENV{'snapshot_id2'}/$ENV{'snapshot_id2'}-candidate-" . get_date() . "/g "; 
    82     $ENV{'munges'} .= "s/\D$ENV{'snapshot_id3'}/$ENV{'snapshot_id3'}-candidate-" . get_date() . "/g"; 
     81    $ENV{'munges'} = "s/$ENV{'snapshot_id2'}/$ENV{'snapshot_id2'}-candidate-" . get_date() . "/g "; 
     82    $ENV{'munges'} .= "s/$ENV{'snapshot_id3'}/$ENV{'snapshot_id3'}-candidate-" . get_date() . "/g"; 
    8383    # the above generates a list of regex. Have a \D (non-digit) prefixed to the value to be substituted, else 
    8484    # Greenstone-documented-examples-2013.06.18.tar.gz gets changed to Greenstone-documented-examples-2013.06-candidate-<daterepeat of 2013.06.18>.18.tar.gz