From 3929bbfb7b62ff0f21e041d425206b35e589455b Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 16 Apr 2007 20:34:57 -0500 Subject: ldconfig changes from CVS forward-porting some 3.0.2 changes * Nagy's ldconfig fix * 3 new pactests to check if ldconfig runs Signed-off-by: Aaron Griffin --- 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(-) create mode 100644 pactest/tests/ldconfig001.py create mode 100644 pactest/tests/ldconfig002.py create mode 100644 pactest/tests/ldconfig003.py diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 5236b6ab..ddeca317 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -837,7 +837,7 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) } /* 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); } diff --git a/pactest/tests/ldconfig001.py b/pactest/tests/ldconfig001.py new file mode 100644 index 00000000..aced413b --- /dev/null +++ b/pactest/tests/ldconfig001.py @@ -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") diff --git a/pactest/tests/ldconfig002.py b/pactest/tests/ldconfig002.py new file mode 100644 index 00000000..162f5831 --- /dev/null +++ b/pactest/tests/ldconfig002.py @@ -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") diff --git a/pactest/tests/ldconfig003.py b/pactest/tests/ldconfig003.py new file mode 100644 index 00000000..1b48efad --- /dev/null +++ b/pactest/tests/ldconfig003.py @@ -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") -- cgit v1.2.3-70-g09d2