Changeset 432

Timestamp:

09/30/2009 22:30:30 (3 years ago)

Author:

blee

Message:

Merge from trunk improved error handling for conf_create_module.

Fixes #67

Location:

branches/confman-1.9

Files:

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

branches/confman-1.9/confman.in

@@ -90 +90 @@
     if [ -z "$*" ] ; then
         conf_lock_wcopy
-        conf_create_module $module
+        conf_create_module $module || exit 1
         conf_unlock_wcopy
     else

branches/confman-1.9/confmanlib.sh.in

@@ -167 +167 @@
 # Assumes that we already have core setup in our work path.
 function conf_create_module {
-        local module=$1
-        @SVN@ mkdir ${WORK_PATH}/$module
-        @SVN@ mkdir ${WORK_PATH}/${REPO_CHECKPTS}/$module
-        @SVN@ commit ${WORK_PATH}/${module} ${WORK_PATH}/${REPO_CHECKPTS}/$module -m \
-                        "Created directory structure for ${module} --`whoami`"
+    local module=$1
+
+    if [ -d ${WORK_PATH}/$module -a -d ${WORK_PATH}/${REPO_CHECKPTS}/$module ]
+    then
+        echo "Module already exists: $module" >&2
+        return 1
+    fi
+
+    @SVN@ mkdir ${WORK_PATH}/$module
+    @SVN@ mkdir ${WORK_PATH}/${REPO_CHECKPTS}/$module
+    @SVN@ commit ${WORK_PATH}/${module} \
+        ${WORK_PATH}/${REPO_CHECKPTS}/$module -m \
+        "Created directory structure for ${module} --`whoami`"
+
+    return 0
 }