Changeset 507

Timestamp:

12/05/2009 19:21:28 (2 years ago)

Author:

ccowart

Message:

Moving up the wcopy lock enforces the existence of the wcopy with
a relevant error message.

Fixes #111

Location:

trunk

Files:

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

trunk/confman.in

@@ -1098 +1098 @@
     if [ -z "$1" ] ; then print_usage 1 ; fi
     local recipe="$1"
+    wcopy_lock=$(conf_lock_wcopy)
+    system_lock=$(conf_lock_system)
     if ! [ -f "$(conf_recipe_dir)/${recipe}" ] ; then
         echo "Error: recipe $recipe does not exist. Create it first!" >&2
         exit 1
     fi
-    wcopy_lock=$(conf_lock_wcopy)
-    system_lock=$(conf_lock_system)
     conf_set_recipe "$recipe"
     conf_unlock_system $system_lock

trunk/confmanlib.sh.in

@@ -1197 +1197 @@
         echo "Error: this action requires that your working copy exist." >&2
         echo 'Please see `confman help setup` for more information.' >&2
-        exit 1
+        die
     fi
 }