summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2005-03-26 08:54:28 +0000
committerAurelien Foret <aurelien@archlinux.org>2005-03-26 08:54:28 +0000
commit3f165e19129f4962231a2f4ce2fb581e8ba1ec9d (patch)
tree70b5fdc66403de77a6a2219e95f881142f948fb8
parentbcfc1244b4114848be3f4cd67099318b6f99413d (diff)
downloadpacman-3f165e19129f4962231a2f4ce2fb581e8ba1ec9d.tar.xz
_alpm_runscriplet fixes
-rw-r--r--lib/libalpm/add.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 778558fb..6f925ae3 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -260,7 +260,7 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
/* pre_upgrade scriptlet */
if(info->scriptlet) {
- runscriptlet(info->data, "pre_upgrade", info->version, oldpkg ? oldpkg->version : NULL);
+ _alpm_runscriptlet(handle->root, info->data, "pre_upgrade", info->version, oldpkg ? oldpkg->version : NULL);
}
if(oldpkg) {
@@ -299,7 +299,7 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
/* pre_install scriptlet */
if(info->scriptlet) {
- runscriptlet(info->data, "pre_install", info->version, NULL);
+ _alpm_runscriptlet(handle->root, info->data, "pre_install", info->version, NULL);
}
}
@@ -592,8 +592,8 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
}
/* run the post-install script if it exists */
- if(info->scriplet) {
- snprintf(pm_install, PATH_MAX, "%s%s/%s/%s-%s/install", handle->root, handle->dbpath, db->treename, info->name, info->version);
+ if(info->scriptlet) {
+ snprintf(pm_install, PATH_MAX, "%s%s/%s/%s-%s/install", handle->root, handle->dbpath, db->treename, info->name, info->version);
if(pmo_upgrade) {
_alpm_runscriptlet(handle->root, pm_install, "post_upgrade", info->version, oldpkg ? oldpkg->version : NULL);
} else {