main/alpine-conf: unbreak lbu

fix regression in lbu that was introduced with commit commit
7ebf92cda21a (main/alpine-conf: fix lbu exit codes on error)

ref https://gitlab.alpinelinux.org/alpine/alpine-conf/merge_requests/4
This commit is contained in:
Natanael Copa 2020-01-24 14:06:06 +00:00
parent d462014a11
commit 28c5b6b96c
2 changed files with 43 additions and 2 deletions

View File

@ -0,0 +1,39 @@
From 5d90f33f62375f23367d3c5a7badd2d7f1031744 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 24 Jan 2020 11:49:04 +0000
Subject: [PATCH] libalpine: make vecho and qecho return success
vecho should return success even if $VERBOSE is empty. Similar, qecho
should return success even if $QUIET is empty.
fixes !4
---
libalpine.sh.in | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libalpine.sh.in b/libalpine.sh.in
index d7b79fa..0f96b9f 100644
--- a/libalpine.sh.in
+++ b/libalpine.sh.in
@@ -26,12 +26,16 @@ echon () {
# echo if in verbose mode
vecho() {
- [ -n "$VERBOSE" ] && echo "$@"
+ if [ -n "$VERBOSE" ]; then
+ echo "$@"
+ fi
}
# echo unless quiet mode
qecho() {
- [ -z "$QUIET" ] && echo "$@"
+ if [ -z "$QUIET" ]; then
+ echo "$@"
+ fi
}
# echo to stderr
--
2.25.0

View File

@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=3.8.3
pkgrel=1
pkgrel=2
pkgdesc="Alpine configuration management scripts"
url="https://git.alpinelinux.org/alpine-conf/about"
arch="all"
@ -9,6 +9,7 @@ license="MIT"
depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3"
source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
0001-libalpine-use-correct-exit-code-in-trap.patch
0001-libalpine-make-vecho-and-qecho-return-success.patch
"
builddir="$srcdir"/$pkgname-$pkgver
@ -26,4 +27,5 @@ package() {
}
sha512sums="73bd999b552d266c994cc1535570b86ddd7a7379f3b9e244c4985722f5754b11323a4e677cdae91fa4f0098dadd388eba679a99d98e140354ab7681bb85f9dfa alpine-conf-3.8.3.tar.xz
b5a4ed4e1507a6dde503edca5bc71c9f26e81e3f85dd01aa3705b300d7e9b9f48b7005250dea3105bef89a688bbf70257290e921d49534f6e6dd8848bb5b2fdb 0001-libalpine-use-correct-exit-code-in-trap.patch"
b5a4ed4e1507a6dde503edca5bc71c9f26e81e3f85dd01aa3705b300d7e9b9f48b7005250dea3105bef89a688bbf70257290e921d49534f6e6dd8848bb5b2fdb 0001-libalpine-use-correct-exit-code-in-trap.patch
8f99efff4f6e3a77b10e4a806ea6cf1ebc81577773314af7d2d8e36b646856a2e5786afbd92841a84af07830e42c7a336c221b1ea97a004963d189767cd348f0 0001-libalpine-make-vecho-and-qecho-return-success.patch"