From 2aab34f1bc87c9384f42d5a083ee13ff9f75cbba Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 20 Jun 2015 09:52:25 +0200
Subject: [PATCH] xbps{,-static}: merge patch from master to report
 required/free space on rootfs.

---
 srcpkgs/xbps-static/template                  |  2 +-
 ..._prepare-if-ENOSPC-keep-the-transact.patch | 28 +++++++++++++++++++
 srcpkgs/xbps/template                         |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xbps/patches/0002-xbps_transaction_prepare-if-ENOSPC-keep-the-transact.patch

diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
index 620bb4aafbe..bd93e0a4a8c 100644
--- a/srcpkgs/xbps-static/template
+++ b/srcpkgs/xbps-static/template
@@ -3,7 +3,7 @@
 # NOTE: keep this package synchronized with "srcpkgs/xbps".
 pkgname=xbps-static
 version=0.45
-revision=3
+revision=4
 build_style=configure
 short_desc="The XBPS package system utilities - static binaries"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
diff --git a/srcpkgs/xbps/patches/0002-xbps_transaction_prepare-if-ENOSPC-keep-the-transact.patch b/srcpkgs/xbps/patches/0002-xbps_transaction_prepare-if-ENOSPC-keep-the-transact.patch
new file mode 100644
index 00000000000..75c47fa28da
--- /dev/null
+++ b/srcpkgs/xbps/patches/0002-xbps_transaction_prepare-if-ENOSPC-keep-the-transact.patch
@@ -0,0 +1,28 @@
+From 00149d0f3775c81c541f48f83860a45998e34c66 Mon Sep 17 00:00:00 2001
+From: Juan RP <xtraeme@voidlinux.eu>
+Date: Sat, 20 Jun 2015 09:48:21 +0200
+Subject: [PATCH] xbps_transaction_prepare: if ENOSPC, keep the transaction
+ dictionary.
+
+... we need this in xbps-install to print required/free space on rootfs.
+
+Close #101
+---
+ NEWS                         | 4 ++++
+ lib/transaction_dictionary.c | 2 --
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+--- lib/transaction_dictionary.c
++++ lib/transaction_dictionary.c
+@@ -344,8 +344,6 @@ xbps_transaction_prepare(struct xbps_handle *xhp)
+ 	 * and removed to the transaction dictionary.
+ 	 */
+ 	if ((rv = compute_transaction_stats(xhp)) != 0) {
+-		xbps_object_release(xhp->transd);
+-		xhp->transd = NULL;
+ 		return rv;
+ 	}
+ 	/*
+-- 
+2.4.4
+
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 873be64a979..10b28a2b62c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.45
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="The XBPS package system utilities"