Changeset 516

Timestamp:

05/12/2011 17:31:18 (13 months ago)

Author:

blee

Message:

merge from trunk confexport locking into confman-1.9, closes #141

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confexport.in (modified) (3 diffs)
• confman.conf.in (modified) (1 diff)
• confmanlib.sh.in (modified) (2 diffs)

branches/confman-1.9/confexport.in

@@ -40 +40 @@
 fi
 
-# This potentially changes the behavior for selecting the REPO_URI
+# This changes the behavior of some library functions (e.g. URIs, locks)
 CONF_EXPORT="true"
 
@@ -64 +64 @@
     exec 1>/dev/null
 fi
+
+confexport_lock_system
 
 umask 077
@@ -102 +104 @@
 fi
 
+confexport_unlock_system "${system_lock}"
+
 echo "Export complete." | conf_logger
 
 conf_cleanExit 0
-

branches/confman-1.9/confman.conf.in

@@ -21 +21 @@
 # The system lockfile
 LOCKFILE="@localstaterundir@/confman.lock"
+
+# The system lockfile for confexport
+CONFEXPORT_LOCKFILE="@localstaterundir@/confexport.lock"
 
 # The script for locking

branches/confman-1.9/confmanlib.sh.in

@@ -209 +209 @@
                     ;;
     esac
+}
+
+function confexport_lock_system {
+    "${LOCK}" lock $$ "${CONFEXPORT_LOCKFILE}" || die
+}
+
+function confexport_unlock_system {
+    "${LOCK}" unlock $$ "${CONFEXPORT_LOCKFILE}"
+}
+
+function confexport_system_is_locked {
+    "${LOCK}" haslock $$ "${CONFEXPORT_LOCKFILE}"
 }
 
@@ -1148 +1160 @@
 
     conf_debug "Removing any system or working copy locks..." >&4
-    conf_wcopy_is_locked && conf_unlock_wcopy ORIGINAL
-    conf_system_is_locked && conf_unlock_system ORIGINAL
+    if ${CONF_EXPORT}; then
+        confexport_system_is_locked && confexport_unlock_system
+    else
+        conf_wcopy_is_locked && conf_unlock_wcopy ORIGINAL
+        conf_system_is_locked && conf_unlock_system ORIGINAL
+    fi
         
         # And this clears any locks we may have created on our working copy: