Changeset 28816

Timestamp:

2014-01-31T16:24:28+13:00 (10 years ago)

Author:

ak19

Message:

When doing an svn_delete operation on a particular subset of collections, want to autocommit only these collections from the model-collect folder and not any other collections that may have been changed therein.

File:

• other-projects/nightly-tasks/diffcol/trunk/gen-model-colls.sh (modified) (4 diffs)

other-projects/nightly-tasks/diffcol/trunk/gen-model-colls.sh

@@ -146 +146 @@
 
     # need slash on end of src dir collect/$collection/ !
-    rsync -r --exclude=.svn/ --exclude=log/ --exclude=cached/--exclude=cache/ --exclude=earliestDatestamp --exclude=fail.log --exclude=collectionConfig.bak collect/$collection/ model-collect/$collection
+    rsync -r --exclude=.svn/ --exclude=log/ --exclude=cached/ --exclude=cache/ --exclude=earliestDatestamp --exclude=fail.log --exclude=collectionConfig.bak collect/$collection/ model-collect/$collection
 
 #    find collect/$collection -name ".svn" -type d -exec rm -rf {} \;
@@ -196 +196 @@
     
     
+    # make a space-separated list of all the collections 
+    # to keep track of which ones should be committed from the model-collect folder
+    concatlist=
+
     if [ "x$1" == "x" ]; then
     for collection in collect/*; do     
         _del_col_archives_index $collection
+        concatlist="$concatlist model-$collection"
     done
     else 
     for collection in "$@"; do
         _del_col_archives_index $collection
+        concatlist="$concatlist model-collect/$collection"
     done
     fi
@@ -215 +221 @@
     # Numerical comparisons: http://tldp.org/LDP/abs/html/comparison-ops.html
     if [ "$debug_mode" -eq "0" ]; then
-    svn commit -m "AUTOCOMMIT by gen-model-colls.sh script. Message: $commit_message" model-collect
+    svn commit -m "AUTOCOMMIT by gen-model-colls.sh script. Message: $commit_message" $concatlist
     fi
 
@@ -241 +247 @@
 
     if [ "$debug_mode" -eq "0" ]; then
-    svn commit -m "AUTOCOMMIT by gen-model-colls.sh script. Message: $commit_message" model-collect
+    svn commit -m "AUTOCOMMIT by gen-model-colls.sh script. Message: $commit_message" $concatlist
     fi