Changeset 373 for trunk/confmanlib.sh.in

Timestamp:

07/02/2009 14:10:41 (3 years ago)

Author:

blee

Message:

Replace WCLOCKFILE global variable with function conf_wcopy_lockfile.

See #35

File:

• trunk/confmanlib.sh.in (modified) (2 diffs)

trunk/confmanlib.sh.in

@@ -29 +29 @@
 REPO_ACTION="${REPO_DB}/last_action"
 REPO_SYNC_STATE="${REPO_DB}/state"
-WCLOCKFILE="${WORK_PATH}/confman.lock"
 METADIR="${WORK_PATH}/meta"
 RECIPEDIR="${METADIR}/recipes"
@@ -85 +84 @@
 
 # Functions for locking and unlocking both the system and the working copy
+function conf_wcopy_lockfile {
+    echo "${WORK_PATH}/confman.lock"
+}
+
 function conf_lock_wcopy {
-    ${LOCK} lock $$ "$WCLOCKFILE" || exit 1
+    ${LOCK} lock $$ $(conf_wcopy_lockfile) || exit 1
 }
 
 function conf_unlock_wcopy {
-    ${LOCK} unlock $$ "$WCLOCKFILE"
+    ${LOCK} unlock $$ $(conf_wcopy_lockfile)
 }
 
 function conf_wcopy_is_locked {
-    ${LOCK} haslock $$ "$WCLOCKFILE"
+    ${LOCK} haslock $$ $(conf_wcopy_lockfile)
 }