[arch-commits] Commit in pacman/trunk (2 files)

[Allan McRae]

    Date: Friday, November 16, 2012 @ 06:17:23
  Author: allan
Revision: 171060

upgpkg: pacman 4.0.3-4

fix pre_upgrade issue

Added:
  pacman/trunk/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
Modified:
  pacman/trunk/PKGBUILD

------------------------------------------------------------------+
 0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch |   29 ++++++++++
 PKGBUILD                                                         |    4 +
 2 files changed, 32 insertions(+), 1 deletion(-)

Added: 0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
===================================================================
--- 0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch	                        (rev 0)
+++ 0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch	2012-11-16 11:17:23 UTC (rev 171060)
@@ -0,0 +1,29 @@
+From 1bf05e706b5edac92e9c913a69ca8686c6440f8b Mon Sep 17 00:00:00 2001
+From: Dan McGee <dan at 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 at 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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-16 02:53:58 UTC (rev 171059)
+++ PKGBUILD	2012-11-16 11:17:23 UTC (rev 171060)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
@@ -21,6 +21,7 @@
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
         0001-Add-conflict-for-replacing-owned-empty-directory.patch
         0002-Check-empty-subdirectory-ownership.patch
+        0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
         pacman.conf
         pacman.conf.x86_64
         makepkg.conf)
@@ -28,6 +29,7 @@
          '1a70392526c8768470da678b31905a6e'
          '1a9b79788640907a2b34e8671cacc94a'
          'a9ddd43891bed364e1e97d27b2887bf1'
+         '2e8cbf55a94b1954b167c5dee6b62317'
          '99734ea46795f466d41c503e9e23b6d4'
          '556d49489e82b5750cf026d3b18c8f4f'
          '589cd34eb9d5b678455e8289394f523e')