Changeset 454

Timestamp:

10/05/2009 00:18:50 (3 years ago)

Author:

blee

Message:

Implement bulk operations for confman recipe remove.

See #72

Location:

trunk

Files:

• confman.in (modified) (1 diff)
• confmanlib.sh.in (modified) (2 diffs)

trunk/confman.in

@@ -917 +917 @@
 
 function recipe_remove {
-    if [ -z "$1" ] ; then print_usage 1 ; fi
-    local recipe="$1"
-    conf_remove_recipe "$recipe"
+    if [ -z "$*" ] ; then print_usage 1 ; fi
+    conf_remove_recipes "$@" || exit 1
 }
 

trunk/confmanlib.sh.in

@@ -964 +964 @@
 }
 
+function conf_remove_recipes {
+    local recipe
+    local oldrecipes
+    local rc=0
+
+    for recipe in "$@"; do
+        if conf_remove_recipe "$recipe"; then
+            # Keep track of the recipes that were successfully removed
+            # to avoid inadvertent commits
+            if [ -z "$oldrecipes" ]; then
+                oldrecipes="$recipe"
+            else
+                oldrecipes="$oldrecipes,$recipe"
+            fi
+        else
+            rc=1
+        fi
+    done
+
+    # $oldrecipes is in the form foo,bar,baz. This eval trick forces
+    # curly brace expansion.
+    if echo "$oldrecipes" | grep -q ','; then
+        @SVN@ commit $(eval echo $(conf_recipe_dir)/{$oldrecipes}) 
+    else
+        @SVN@ commit "$(conf_recipe_dir)/$oldrecipes"
+    fi
+
+    return $rc
+}
+
 function conf_remove_recipe {
     local recipe="$1"
@@ -971 +1001 @@
         return 1
     fi
-    @SVN@ rm "${recipe_file}"
-    @SVN@ commit "${recipe_file}"
+    @SVN@ rm "${recipe_file}" || return 1
+    return 0
 }