diff options
| author | Dan McGee <dan@archlinux.org> | 2011-09-28 10:45:46 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-09-30 17:55:58 +0200 |
| commit | 73139ccb3c47ed1ebb1a62a27deb080b66d92bf4 (patch) | |
| tree | 20235847d37c48258bc5b192615db5991ba71cb0 /lib/libalpm/remove.c | |
| parent | 6bb594802588240405efee0813f7aa1daa9648b3 (diff) | |
| download | pacman-73139ccb3c47ed1ebb1a62a27deb080b66d92bf4.tar.gz pacman-73139ccb3c47ed1ebb1a62a27deb080b66d92bf4.tar.xz | |
Refactor _alpm_runscriptlet()
Add an is_archive parameter to reduce the amount of black magic going
on. Rework to use fewer PATH_MAX sized local variables, and simplify
some of the logic where appropriate in both this function and in the
callers where duplicate calls can be replaced by some conditional
parameter code.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/remove.c')
| -rw-r--r-- | lib/libalpm/remove.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index a3aa4a53..7f917faa 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -376,7 +376,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, /* run the pre-remove scriptlet if it exists */ if(alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL); + _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL, 0); } } @@ -453,7 +453,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, /* run the post-remove script if it exists */ if(alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL); + _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL, 0); } } |