Remove lockfile configuration from frontend, make it job of libalpm

I previously introduced some patches to make just about every path in
pacman/libalpm configurable; doing this with the lockfile seemed a bit too
far and we really should just place the lockfile where it belongs- with the
DB that needs locking.

More details in this thread:
http://archlinux.org/pipermail/pacman-dev/2007-June/008499.html

Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 3 insertions, 4 deletions

diff --git a/pactest/pmtest.py b/pactest/pmtest.py
index dd524211..00dd3cbc 100755
--- a/pactest/pmtest.py
+++ b/pactest/pmtest.py
@@ -192,13 +192,12 @@ class pmtest:
             cmd.append("libtool gdb --args")
         if pacman["valgrind"]:
             cmd.append("valgrind --tool=memcheck --leak-check=full --show-reachable=yes")
-        cmd.append("%s --config=%s --root=%s --dbpath=%s --cachedir=%s --lock=%s" \
+        cmd.append("%s --config=%s --root=%s --dbpath=%s --cachedir=%s" \
                    % (pacman["bin"],
                        os.path.join(self.root, PACCONF),
                        self.root,
                        os.path.join(self.root, PM_DBPATH),
-                       os.path.join(self.root, PM_CACHEDIR),
-                       os.path.join(self.root, PM_LOCK) ))
+                       os.path.join(self.root, PM_CACHEDIR)))
         if not pacman["manual-confirm"]:
             cmd.append("--noconfirm")
         if pacman["debug"]:
diff --git a/pactest/util.py b/pactest/util.py
index 98c22a5c..d3203428 100755
--- a/pactest/util.py
+++ b/pactest/util.py
@@ -27,8 +27,8 @@ import stat
 # ALPM
 PM_ROOT     = "/"
 PM_DBPATH   = "var/lib/pacman"
+PM_LOCK     = "var/lib/pacman/db.lck"
 PM_CACHEDIR = "var/cache/pacman/pkg"
-PM_LOCK     = "var/run/pacman.lck"
 PM_EXT_PKG  = ".pkg.tar.gz"
 PM_EXT_DB   = ".db.tar.gz"
 PM_PACNEW   = ".pacnew"