Changeset 452

Timestamp:

10/04/2009 23:46:14 (3 years ago)

Author:

blee

Message:

Implement bulk operations for confman rmmod and robustify error handling.

See #72

Location:

trunk

Files:

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

trunk/confman.in

@@ -744 +744 @@
 
 function rmmod {
-    local module=$1
-    if [ -z $module ] ; then
-        print_usage 1
-    fi
-    conf_lock_wcopy
-    conf_rmmod $module
-    conf_unlock_wcopy
+    if [ -z "$*" ] ; then
+        print_usage 1
+    else
+        conf_lock_wcopy
+        conf_remove_modules "$@" || exit 1
+        conf_unlock_wcopy
+    fi
 }
 

trunk/confmanlib.sh.in

@@ -713 +713 @@
 }
 
+function conf_remove_modules {
+    local module
+    local rc=0
+
+    for module in "$@"; do
+        conf_rmmod "$module" || rc=1
+    done
+
+    return $rc
+}
+
 function conf_rmmod {
-        local module=$1
-        @SVN@ rm ${WORK_PATH}/${module}
-        @SVN@ rm ${WORK_PATH}/${REPO_CHECKPTS}/${module}
+        local module="$1"
+    local dir
+    local rc=0
+
+    for dir in ${WORK_PATH}/{,${REPO_CHECKPTS}/}${module}; do
+        if ! [ -d "$dir" ]; then
+            echo "No such directory: $dir" >&2
+            rc=1
+        else
+            @SVN@ rm $dir || rc=1
+        fi
+    done
+
+    return $rc
 }