From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3831138334 for ; Fri, 10 May 2019 07:30:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4002E0869; Fri, 10 May 2019 07:30:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96EC2E0869 for ; Fri, 10 May 2019 07:30:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 287EA343F14 for ; Fri, 10 May 2019 07:30:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64B7C5E1 for ; Fri, 10 May 2019 07:30:14 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1557473166.47ea04c729af2408a3a8bd81a41bf0a260cb1f3e.grobian@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: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 47ea04c729af2408a3a8bd81a41bf0a260cb1f3e X-VCS-Branch: master Date: Fri, 10 May 2019 07:30:14 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dc5c559a-6f39-422d-9ce7-23083089831e X-Archives-Hash: 171263fb5d2d1f71b4c7c76e3e5bf38d commit: 47ea04c729af2408a3a8bd81a41bf0a260cb1f3e Author: Joakim Tjernlund infinera com> AuthorDate: Thu May 9 17:25:58 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri May 10 07:26:06 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=47ea04c7 qmerge: implement keepdir and dodir, bug #682316 Bug: https://bugs.gentoo.org/682316 Signed-off-by: Joakim Tjernlund infinera.com> Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qmerge.c b/qmerge.c index e6bbdb5..a144805 100644 --- a/qmerge.c +++ b/qmerge.c @@ -739,6 +739,8 @@ pkg_run_func_at(int dirfd, const char *vdb_path, const char *phases, const char "nonfatal() { \"$@\"; }\n" "ebegin() { printf ' * %%b ...' \"$*\"; }\n" "eend() { local r=${1:-$?}; [ $# -gt 0 ] && shift; [ $r -eq 0 ] && echo ' [ ok ]' || echo \" $* \"'[ !! ]'; return $r; }\n" + "dodir() { mkdir -p \"$@\"; }\n" + "keepdir() { dodir \"$@\" && touch \"$@\"/.keep_${CATEGORY}_${PN}-${SLOT%%/*}; }\n" /* TODO: This should be fatal upon error */ "emake() { ${MAKE:-make} ${MAKEOPTS} \"$@\"; }\n" /* Unpack the env if need be */