From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 01770138A1A for ; Thu, 19 Feb 2015 07:49:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B342E094A; Thu, 19 Feb 2015 07:49:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4430DE094A for ; Thu, 19 Feb 2015 07:49:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B9B2340890 for ; Thu, 19 Feb 2015 07:49:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAFEC1213E for ; Thu, 19 Feb 2015 07:49:16 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1424332133.502518899f60bde86ba2d2e5c0e400d7142d2096.vapier@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 502518899f60bde86ba2d2e5c0e400d7142d2096 X-VCS-Branch: master Date: Thu, 19 Feb 2015 07:49:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8c138734-2024-46f4-a38c-87c0b1e0af44 X-Archives-Hash: a04cc3b2ae2e7ca8c731c2b31cc6c81e commit: 502518899f60bde86ba2d2e5c0e400d7142d2096 Author: Mike Frysinger gentoo org> AuthorDate: Thu Feb 19 07:48:53 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Feb 19 07:48:53 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage-utils.git;a=commit;h=50251889 qmerge: add usev & nonfatal --- qmerge.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qmerge.c b/qmerge.c index 165caa9..e4b8f96 100644 --- a/qmerge.c +++ b/qmerge.c @@ -444,7 +444,8 @@ pkg_run_func(const char *vdb_path, const char *phases, const char *func, const c /* best_version() */ "use() { useq \"$@\"; }\n" "usex() { useq \"$1\" && echo \"${2-yes}$4\" || echo \"${3-no}$5\"; }\n" - "useq() { hasq \"$1\" $USE; }\n" + "useq() { hasq \"$1\" ${USE}; }\n" + "usev() { hasv \"$1\" ${USE}; }\n" "has() { hasq \"$@\"; }\n" "hasq() { local h=$1; shift; case \" $* \" in *\" $h \"*) return 0;; *) return 1;; esac; }\n" "hasv() { hasq \"$@\" && echo \"$1\"; }\n" @@ -454,8 +455,11 @@ pkg_run_func(const char *vdb_path, const char *phases, const char *func, const c "eqawarn() { elog \"QA: \"\"$@\"; }\n" "eerror() { elog \"$@\"; }\n" "die() { eerror \"$@\"; exit 1; }\n" + /* TODO: This should suppress `die` */ + "nonfatal() { \"$@\"; }\n" "ebegin() { printf ' * %%b ...' \"$*\"; }\n" "eend() { local r=${1:-$?}; [ $# -gt 0 ] && shift; [ $r -eq 0 ] && echo ' [ ok ]' || echo \" $* \"'[ !! ]'; return $r; }\n" + /* TODO: This should be fatal upon error */ "emake() { ${MAKE:-make} ${MAKEOPTS} \"$@\"; }\n" /* Unpack the env if need be */ "[ -e '%1$s/environment' ] || { bzip2 -dc '%1$s/environment.bz2' > '%1$s/environment' || exit 1; }\n"