Changeset 519 for trunk

Timestamp:

05/20/2011 11:36:45 (12 months ago)

Author:

joshu

Message:

Addresses blee's worries about a race condition in confman updates by specifying
a revision using the -r flag for svn.

See #10.

File:

• trunk/confmanlib.sh.in (modified) (1 diff)

trunk/confmanlib.sh.in

@@ -140 +140 @@
     [ -r $(conf_recipe_dir)/${recipe} ] || exit 1
     @SVN@ update $args $(conf_recipe_dir)/${recipe}
+    if ! [[ $args =~ .*-r.* ]]; then
+        # make sure that svn is pulling the same revision everywhere
+        args="${args} -r $(@SVN@ info $(conf_recipe_dir)/${recipe} | \
+            awk '/^Revision:/ { print $2 }')"
+    fi
     for module in $(conf_get_recipe $(conf_recipe_dir)/${recipe}); do
         relevant_files="$relevant_files ${WORK_PATH}/${module}"