Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4d6f9788906ae1e07663db945e4a57ee00df0564
commit 4d6f9788906ae1e07663db945e4a57ee00df0564
Author: James Buren <r...@frugalware.org>
Date: Mon Feb 18 02:02:31 2013 -0600
libpacman:
from previous fix, drop comments for original ldconfig execution.
also, move the ldconfig calls to right before post for install/upgrade
and right after post for remove
diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c
index 2b30e4c..07316ee 100644
--- a/lib/libpacman/add.c
+++ b/lib/libpacman/add.c
@@ -816,10 +816,9 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data)
EVENT(trans, PM_TRANS_EVT_EXTRACT_DONE, NULL, NULL);
FREE(what);
- _pacman_ldconfig(handle->root);
-
/* run the post-install script if it exists */
if(info->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
+ _pacman_ldconfig(handle->root);
snprintf(pm_install, PATH_MAX, "%s%s/%s/%s-%s/install", handle->root,
handle->dbpath, db->treename, info->name, info->version);
if(pmo_upgrade) {
_pacman_runscriptlet(handle->root, pm_install, "post_upgrade", info->version,
oldpkg ? oldpkg->version : NULL, trans);
@@ -833,12 +832,10 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data)
FREEPKG(oldpkg);
}
-#if 0
/* run ldconfig if it exists */
if(handle->trans->state != STATE_INTERRUPTED) {
_pacman_ldconfig(handle->root);
}
-#endif
return(ret);
}
diff --git a/lib/libpacman/remove.c b/lib/libpacman/remove.c
index c5ccb28..c8d11cd 100644
--- a/lib/libpacman/remove.c
+++ b/lib/libpacman/remove.c
@@ -285,6 +285,7 @@ int _pacman_remove_commit(pmtrans_t *trans, pmlist_t **data)
if(info->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db->path, info->name,
info->version);
_pacman_runscriptlet(handle->root, pm_install, "post_remove", info->version,
NULL, trans);
+ _pacman_ldconfig(handle->root);
}
}
@@ -343,17 +344,14 @@ int _pacman_remove_commit(pmtrans_t *trans, pmlist_t
**data)
}
if(trans->type != PM_TRANS_TYPE_UPGRADE) {
- _pacman_ldconfig(handle->root);
EVENT(trans, PM_TRANS_EVT_REMOVE_DONE, info, NULL);
}
}
-#if 0
/* run ldconfig if it exists */
if((trans->type != PM_TRANS_TYPE_UPGRADE) && (handle->trans->state !=
STATE_INTERRUPTED)) {
_pacman_ldconfig(handle->root);
}
-#endif
return(0);
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
