[pacman-dev] CVS update of pacman-lib (4 files)

[Aaron Griffin]

    Date: Monday, April 16, 2007 @ 22:31:04
  Author: aaron
    Path: /home/cvs-pacman/pacman-lib

   Added: pactest/tests/ldconfig001.py (1.1)
          pactest/tests/ldconfig002.py (1.1)
          pactest/tests/ldconfig003.py (1.1)
Modified: lib/libalpm/add.c (1.130 -> 1.131)

* Nagy Gabor <ngaba at petra.hos.u-szeged.hu> 
  Make sure ldconfig runs on upgrade
* Added 3 pactests to verify (by output only) that ldconfig is run


------------------------------+
 lib/libalpm/add.c            |    2 +-
 pactest/tests/ldconfig001.py |   12 ++++++++++++
 pactest/tests/ldconfig002.py |   16 ++++++++++++++++
 pactest/tests/ldconfig003.py |   14 ++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)


Index: pacman-lib/lib/libalpm/add.c
diff -u pacman-lib/lib/libalpm/add.c:1.130 pacman-lib/lib/libalpm/add.c:1.131
--- pacman-lib/lib/libalpm/add.c:1.130	Thu Mar 22 14:33:27 2007
+++ pacman-lib/lib/libalpm/add.c	Mon Apr 16 22:31:04 2007
@@ -837,7 +837,7 @@
 	}
 
 	/* run ldconfig if it exists */
-	if((trans->type != PM_TRANS_TYPE_UPGRADE) && (handle->trans->state != STATE_INTERRUPTED)) {
+	if(handle->trans->state != STATE_INTERRUPTED) {
 		_alpm_log(PM_LOG_DEBUG, _("running \"ldconfig -r %s\""), handle->root);
 		_alpm_ldconfig(handle->root);
 	}
Index: pacman-lib/pactest/tests/ldconfig001.py
diff -u /dev/null pacman-lib/pactest/tests/ldconfig001.py:1.1
--- /dev/null	Mon Apr 16 22:31:05 2007
+++ pacman-lib/pactest/tests/ldconfig001.py	Mon Apr 16 22:31:04 2007
@@ -0,0 +1,12 @@
+# quick note here - chroot() is expected to fail.  We're not checking the
+# validity of the scripts, only that they fire (or try to)
+self.description = "Make sure ldconfig runs on an add operation"
+
+p = pmpkg("dummy")
+self.addpkg(p)
+
+# --debug is necessary to check PACMAN_OUTPUT
+self.args = "--debug -A %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_OUTPUT=ldconfig")
Index: pacman-lib/pactest/tests/ldconfig002.py
diff -u /dev/null pacman-lib/pactest/tests/ldconfig002.py:1.1
--- /dev/null	Mon Apr 16 22:31:05 2007
+++ pacman-lib/pactest/tests/ldconfig002.py	Mon Apr 16 22:31:04 2007
@@ -0,0 +1,16 @@
+# quick note here - chroot() is expected to fail.  We're not checking the
+# validity of the scripts, only that they fire (or try to)
+self.description = "Make sure ldconfig runs on an upgrade operation"
+
+lp = pmpkg("dummy")
+self.addpkg2db("local", lp)
+
+p = pmpkg("dummy", "1.0-2")
+self.addpkg(p)
+
+# --debug is necessary to check PACMAN_OUTPUT
+self.args = "--debug -U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=dummy|1.0-2")
+self.addrule("PACMAN_OUTPUT=ldconfig")
Index: pacman-lib/pactest/tests/ldconfig003.py
diff -u /dev/null pacman-lib/pactest/tests/ldconfig003.py:1.1
--- /dev/null	Mon Apr 16 22:31:05 2007
+++ pacman-lib/pactest/tests/ldconfig003.py	Mon Apr 16 22:31:04 2007
@@ -0,0 +1,14 @@
+# quick note here - chroot() is expected to fail.  We're not checking the
+# validity of the scripts, only that they fire (or try to)
+self.description = "Make sure ldconfig runs on a sync operation"
+
+sp = pmpkg("dummy")
+self.addpkg2db("sync", sp)
+
+self.args = "-S %s" % sp.name
+
+# --debug is necessary to check PACMAN_OUTPUT
+self.args = "--debug -S %s" % sp.name
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_OUTPUT=ldconfig")