diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-11-28 15:26:34 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-11-28 15:26:34 (GMT) |
| commit | d57f97ec584566894ff036d0758411170c0df619 (patch) | |
| tree | 73c0fcee2e893adfe528a5bba77e2f0a3685e88b /abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch | |
| parent | 45d86d89c1b0c798779a60e5a1d2975cc44b3406 (diff) | |
| download | linhes_pkgbuild-d57f97ec584566894ff036d0758411170c0df619.zip linhes_pkgbuild-d57f97ec584566894ff036d0758411170c0df619.tar.gz linhes_pkgbuild-d57f97ec584566894ff036d0758411170c0df619.tar.bz2 | |
pacman: 4.0.3 recompile
Diffstat (limited to 'abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch')
| -rw-r--r-- | abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch b/abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch new file mode 100644 index 0000000..ae3a57e --- /dev/null +++ b/abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch @@ -0,0 +1,29 @@ +From 1bf05e706b5edac92e9c913a69ca8686c6440f8b Mon Sep 17 00:00:00 2001 +From: Dan McGee <dan@archlinux.org> +Date: Fri, 04 May 2012 16:41:40 +0000 +Subject: Ensure pre_upgrade scriptlet gets old package version + +This was accidentally broken in the refactor done in commit 73139ccb. + +Fixes FS#29371. + +Signed-off-by: Dan McGee <dan@archlinux.org> +--- +diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c +index 6c2f0cb..c49d99b 100644 +--- a/lib/libalpm/add.c ++++ b/lib/libalpm/add.c +@@ -488,8 +488,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 */ +-- +cgit v0.9.0.2-13-g2bd3 |