Changeset 557

Timestamp:

12/16/2011 18:07:03 (5 months ago)

Author:

blee

Message:

Merge fix for #111 into confman-1.9.

Closes #111

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

@@ -1099 +1099 @@
     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

branches/confman-1.9/confmanlib.sh.in

@@ -1216 +1216 @@
         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
 }