xbps{,-static}: merge patch from master to report required/free space on rootfs.

This commit is contained in:
Juan RP 2015-06-20 09:52:25 +02:00
parent ec4cf14a1c
commit 2aab34f1bc
3 changed files with 30 additions and 2 deletions

View File

@ -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>"

View File

@ -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

View File

@ -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"