moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

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 <aaronmgriffin@gmail.com>
This commit is contained in:
Aaron Griffin 2007-04-16 20:34:57 -05:00
parent 721ceee1e2
commit 3929bbfb7b
4 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libalpm/add.c
View File

@ -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);
}

12
pactest/tests/ldconfig001.py Normal file
View File

@ -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")

16
pactest/tests/ldconfig002.py Normal file
View File

@ -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")

14
pactest/tests/ldconfig003.py Normal file
View File

@ -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")