xbps: another patch from git master for xbps-install(8).
This commit is contained in:
parent
7c96025c1f
commit
596cb17f4f
@ -0,0 +1,27 @@
|
|||||||
|
From fa40928026bd31ebc398a91066efe6709838f9a3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Juan RP <xtraeme@gmail.com>
|
||||||
|
Date: Wed, 16 Jan 2013 11:47:52 +0100
|
||||||
|
Subject: [PATCH] xbps-install: don't treat EEXIST as an error when installing
|
||||||
|
pkgs.
|
||||||
|
|
||||||
|
Thanks to pancake for the bug hunting.
|
||||||
|
---
|
||||||
|
NEWS | 3 +++
|
||||||
|
bin/xbps-install/transaction.c | 1 +
|
||||||
|
2 files changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/bin/xbps-install/transaction.c b/bin/xbps-install/transaction.c
|
||||||
|
index b91448b..480faeb 100644
|
||||||
|
--- bin/xbps-install/transaction.c
|
||||||
|
+++ bin/xbps-install/transaction.c
|
||||||
|
@@ -218,6 +218,7 @@ install_new_pkg(struct xbps_handle *xhp, const char *pkg, bool reinstall)
|
||||||
|
if ((rv = xbps_transaction_install_pkg(xhp, pkg, reinstall)) != 0) {
|
||||||
|
if (rv == EEXIST) {
|
||||||
|
printf("Package `%s' already installed.\n", pkg);
|
||||||
|
+ rv = 0;
|
||||||
|
} else if (rv == ENOENT) {
|
||||||
|
fprintf(stderr, "Unable to locate '%s' in "
|
||||||
|
"repository pool.\n", pkg);
|
||||||
|
--
|
||||||
|
1.8.1.1
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
# Template file for 'xbps'
|
# Template file for 'xbps'
|
||||||
pkgname=xbps
|
pkgname=xbps
|
||||||
version=0.19.1
|
version=0.19.1
|
||||||
revision=4
|
revision=5
|
||||||
build_style=configure
|
build_style=configure
|
||||||
configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
|
configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
|
||||||
--with-tests --with-static"
|
--with-tests --with-static"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user