diff options
| author | Dan McGee <dan@archlinux.org> | 2012-05-21 00:41:21 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-05-21 00:41:21 +0200 |
| commit | 9f6a67fee71a63848f958212c1b5a2abd0f735a5 (patch) | |
| tree | e33a982bca695119eb4ffe938e5b5acf42dad554 /lib | |
| parent | fc9002188b588cda1f5362d6d15bd6996c532982 (diff) | |
| parent | 5de465d63efbb82da6127ac927ad29b9c8b1b542 (diff) | |
| download | pacman-9f6a67fee71a63848f958212c1b5a2abd0f735a5.tar.gz pacman-9f6a67fee71a63848f958212c1b5a2abd0f735a5.tar.xz | |
Merge branch 'maint'
Conflicts:
scripts/pacman-key.sh.in
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libalpm/add.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index b0077665..edddc318 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -489,8 +489,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install"; - _alpm_runscriptlet(handle, pkgfile, - scriptlet_name, newpkg->version, NULL, 1); + + _alpm_runscriptlet(handle, pkgfile, scriptlet_name, + newpkg->version, oldpkg ? oldpkg->version : NULL, 1); } /* we override any pre-set reason if we have alldeps or allexplicit set */ |