Changeset 27661

Timestamp:

2013-06-19T15:36:31+12:00 (11 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:

• lib.pl (modified) (1 diff)
• task.pl (modified) (1 diff)

other-projects/nightly-tasks/snapshot/trunk/lib.pl

@@ -95 +95 @@
 
     #copy products to a temporary folder, giving them their new names
-    if ( ! -d "$release_dir${sep}uploads" ) {
+    if ( -d "$release_dir${sep}uploads" ) {
         system( "rm -rf '$release_dir${sep}uploads'" );
     }

other-projects/nightly-tasks/snapshot/trunk/task.pl

@@ -79 +79 @@
     
     #change the filenames to have the date in them
-    $ENV{'munges'} = "s/\D$ENV{'snapshot_id2'}/$ENV{'snapshot_id2'}-candidate-" . get_date() . "/g ";
-    $ENV{'munges'} .= "s/\D$ENV{'snapshot_id3'}/$ENV{'snapshot_id3'}-candidate-" . get_date() . "/g";
+    $ENV{'munges'} = "s/$ENV{'snapshot_id2'}/$ENV{'snapshot_id2'}-candidate-" . get_date() . "/g ";
+    $ENV{'munges'} .= "s/$ENV{'snapshot_id3'}/$ENV{'snapshot_id3'}-candidate-" . get_date() . "/g";
     # the above generates a list of regex. Have a \D (non-digit) prefixed to the value to be substituted, else
     # 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