jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps{,-static}: merge patch from master to print msg guards.

Browse source
This commit is contained in:
Juan RP 2014-09-16 10:03:11 +02:00
parent da3f5824f9
commit 1faf5f21c7
3 changed files with 53 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/xbps-static/template
View file

@ -3,7 +3,7 @@
# NOTE: keep this package synchronized with "srcpkgs/xbps".
pkgname=xbps-static
version=0.39
revision=2
revision=3
bootstrap=yes
short_desc="The XBPS package system utilities - static binaries"
maintainer="Juan RP <xtraeme@gmail.com>"

51
srcpkgs/xbps/patches/0002-xbps-install-remove-print-guards-in-post-install-pre.patch Normal file
View file

@ -0,0 +1,51 @@
From f80df0fa22ca7d2e0879a943b307770d532db8e8 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 16 Sep 2014 09:56:00 +0200
Subject: [PATCH 1/3] xbps-{install,remove}: print guards in
post-install/pre-remove messages.
This avoids the need to manually add them to the {INSTALL,REMOVE}.msg
files in binary packages, and saves some bytes in the repository archive
and binary packages.
Idea by @dominikh.
---
bin/xbps-install/state_cb.c | 5 ++++-
bin/xbps-remove/main.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/bin/xbps-install/state_cb.c b/bin/xbps-install/state_cb.c
index 88f2925..0b5ee4a 100644
--- bin/xbps-install/state_cb.c
+++ bin/xbps-install/state_cb.c
@@ -141,7 +141,10 @@ state_cb(const struct xbps_state_cb_data *xscd, void *cbdata _unused)
rv = yesno("Do you want to import this public key?");
break;
case XBPS_STATE_SHOW_INSTALL_MSG:
- printf("%s: post-install message:\n%s", xscd->arg, xscd->desc);
+ printf("%s: post-install message:\n", xscd->arg);
+ printf("========================================================================\n");
+ printf("%s", xscd->desc);
+ printf("========================================================================\n");
break;
case XBPS_STATE_UNPACK_FILE_PRESERVED:
printf("%s\n", xscd->desc);
diff --git a/bin/xbps-remove/main.c b/bin/xbps-remove/main.c
index 5c2f23a..7b56328 100644
--- bin/xbps-remove/main.c
+++ bin/xbps-remove/main.c
@@ -92,7 +92,10 @@ state_cb_rm(const struct xbps_state_cb_data *xscd, void *cbdata _unused)
}
break;
case XBPS_STATE_SHOW_REMOVE_MSG:
- printf("%s: pre-remove message:\n%s", xscd->arg, xscd->desc);
+ printf("%s: pre-remove message:\n", xscd->arg);
+ printf("========================================================================\n");
+ printf("%s", xscd->desc);
+ printf("========================================================================\n");
break;
/* errors */
case XBPS_STATE_REMOVE_FAIL:
--
2.1.0

2
srcpkgs/xbps/template
View file

@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.39
revision=2
revision=3
bootstrap=yes
short_desc="The XBPS package system utilities"
maintainer="Juan RP <xtraeme@gmail.com>"