Changeset 11104

Timestamp:

2006-01-26T11:42:00+13:00 (18 years ago)

Author:

mdewsnip

Message:

A couple of fixes for handling resource bundles, and for handling files not in CVS.

File:

• trunk/gsdl/bin/script/gti.pl (modified) (2 diffs)

trunk/gsdl/bin/script/gti.pl

@@ -541 +541 @@
 
     # Check that the source file is up to date
+    # The "2>/dev/null" is very important! If it is missing this will never return when run from the receptionist
     # unless ($translation_file_is_not_in_cvs) {
-    my $source_file_cvs_status = `cd $gsdl_root_directory; cvs -d $anonymous_cvs_root update $source_file`;
+    my $source_file_cvs_status = `cd $gsdl_root_directory; cvs -d $anonymous_cvs_root update $source_file 2>/dev/null`;
     if ($source_file_cvs_status =~ /^C /) {
         &throw_fatal_error("Source file $source_file_path conflicts with the repository.");
@@ -1087 +1088 @@
 
     # Simple: just remove string key
-    $chunk_text =~ s/^(\S+?)://;
+    $chunk_text =~ s/^(\S+?):(\s*)//;
     $chunk_text =~ s/(\s*)$//;  # Remove any nasty whitespace, carriage returns etc.
+    $chunk_text =~ s/(\s*)\#\s+Updated\s+(\d?\d-\D\D\D-\d\d\d\d)\s*$//i;
 
     return $chunk_text;