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 5C0C61382C5 for ; Sat, 16 May 2020 06:53:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83FB9E096D; Sat, 16 May 2020 06:53:34 +0000 (UTC) Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) (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 7C33FE096D for ; Sat, 16 May 2020 06:53:34 +0000 (UTC) Received: by mail-pj1-f68.google.com with SMTP id q9so2049649pjm.2 for ; Fri, 15 May 2020 23:53:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T5o9lpQ7uEu4cjlSy37wUaG/RVpvNqhVsYVmD/rq2QQ=; b=kHdfEaLc2JsGWxIqmsL5nff3olOeVV1Zv2xyky/UFQGk9z186Dtt1dP7+nIZ8Iz5SC IJUPTLYDeYsE8pT7Z3FQgeMIJfOrWkaTSakGXoZmdMLt2Rx1OwP/CrtHnaeLRz7wBHy2 d9WCfX+RYg7Vsij4JRFxZe9oIM4nzg5URYlizX8duSa7PQ8LxPBJo5k6Gx++C4Xn/Ewv D5P+9Dbj+uikyuXcpIh8iALZ40T13oDRfx2Hk11O8rvlcYgyUCuCA1btLFoVmKfiliOe iloItOTXZ8BAkEpHrBkZBxkYIV7NtodTsUnOYhV17YDi8jRJuH/SqehHBIzXSvp7oQe3 YM/w== X-Gm-Message-State: AOAM530ctEuJSJX7CzI6WEGvp81hlo4u6U0K19D3yc8yXvCqbJa5HiHD 1EtkN5dWQtgAHG4LoZJWW1MUaZwp X-Google-Smtp-Source: ABdhPJxTECrWz+GfKFURa0JDXk5O3h7qMhe8iQBqo6MDbsYJpoi6NAEYWLt5PYmrsCf4ZXgky5nxZg== X-Received: by 2002:a17:90a:35a7:: with SMTP id r36mr8047345pjb.117.1589612013193; Fri, 15 May 2020 23:53:33 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id f70sm3452295pfa.17.2020.05.15.23.53.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2020 23:53:32 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 6/9] targets: Remove || exit 1 from run_merge invocations Date: Fri, 15 May 2020 23:53:14 -0700 Message-Id: <20200516065317.2678080-6-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200516065317.2678080-1-mattst88@gentoo.org> References: <20200516065317.2678080-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 11d2f2b2-77f9-48c4-97c5-33ee04ab54ae X-Archives-Hash: 25af95da4a863c6ec657147f1361ab0b run_merge itself executes exit 1 if it fails, so this is dead code. Signed-off-by: Matt Turner --- targets/stage2/preclean-chroot.sh | 6 +++--- targets/stage3/preclean-chroot.sh | 4 ++-- targets/support/chroot-functions.sh | 8 ++++---- targets/support/kmerge.sh | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/targets/stage2/preclean-chroot.sh b/targets/stage2/preclean-chroot.sh index 3b693d81..84b267ec 100755 --- a/targets/stage2/preclean-chroot.sh +++ b/targets/stage2/preclean-chroot.sh @@ -11,15 +11,15 @@ cleanup_stages if [ -n "${clst_CCACHE}" ] then - run_merge -C dev-util/ccache || exit 1 + run_merge -C dev-util/ccache fi if [ -n "${clst_DISTCC}" ] then - run_merge -C sys-devel/distcc || exit 1 + run_merge -C sys-devel/distcc fi if [ -n "${clst_ICECREAM}" ] then - run_merge -C sys-devel/icecream || exit 1 + run_merge -C sys-devel/icecream fi diff --git a/targets/stage3/preclean-chroot.sh b/targets/stage3/preclean-chroot.sh index 33a700a6..1d801572 100755 --- a/targets/stage3/preclean-chroot.sh +++ b/targets/stage3/preclean-chroot.sh @@ -13,11 +13,11 @@ if [ -n "${clst_DISTCC}" ] then portageq has_version / sys-devel/distcc if [ $? == 0 ]; then - run_merge -C sys-devel/distcc || exit 1 + run_merge -C sys-devel/distcc fi fi if [ -n "${clst_ICECREAM}" ] then - run_merge -C sys-devel/icecream || exit 1 + run_merge -C sys-devel/icecream fi diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index b7969607..488041fe 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -83,7 +83,7 @@ setup_features() { if [ -n "${clst_CCACHE}" ] then features+=(ccache) - clst_root_path=/ run_merge --oneshot --noreplace dev-util/ccache || exit 1 + clst_root_path=/ run_merge --oneshot --noreplace dev-util/ccache fi if [ -n "${clst_DISTCC}" ] @@ -98,9 +98,9 @@ setup_features() { # reinstall if it isn't found. if [ "$(getent passwd distcc | cut -d: -f1)" != "distcc" ] then - clst_root_path=/ run_merge --oneshot sys-devel/distcc || exit 1 + clst_root_path=/ run_merge --oneshot sys-devel/distcc else - clst_root_path=/ run_merge --oneshot --noreplace sys-devel/distcc || exit 1 + clst_root_path=/ run_merge --oneshot --noreplace sys-devel/distcc fi sed -i '/USE="${USE} -avahi -gtk -gnome"/d' ${clst_make_conf} mkdir -p /etc/distcc @@ -119,7 +119,7 @@ setup_features() { if [ -n "${clst_ICECREAM}" ] then - clst_root_path=/ run_merge --oneshot --noreplace sys-devel/icecream || exit 1 + clst_root_path=/ run_merge --oneshot --noreplace sys-devel/icecream # This sets up automatic cross-icecc-fu according to # http://www.gentoo-wiki.info/HOWTO_Setup_An_ICECREAM_Compile_Cluster diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index e92072bb..3629be57 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -212,7 +212,7 @@ then # install dependencies of kernel sources ahead of time in case # package.provided generated below causes them not to be (re)installed - PKGDIR=${PKGDIR} run_merge --onlydeps "${clst_ksource}" || exit 1 + PKGDIR=${PKGDIR} run_merge --onlydeps "${clst_ksource}" # Create the kerncache directory if it doesn't exists mkdir -p /tmp/kerncache/${clst_kname} @@ -236,7 +236,7 @@ then [ -L /usr/src/linux ] && rm -f /usr/src/linux - PKGDIR=${PKGDIR} run_merge "${clst_ksource}" || exit 1 + PKGDIR=${PKGDIR} run_merge "${clst_ksource}" SOURCESDIR="/tmp/kerncache/${clst_kname}/sources" if [ -L /usr/src/linux ] @@ -269,7 +269,7 @@ then fi else - run_merge "${clst_ksource}" || exit 1 + run_merge "${clst_ksource}" #ensure that there is a /usr/src/linux symlink and it points to the sources we just installed echo "Adjusting /usr/src/linux to point to \ $(portageq contents / $(portageq best_visible / "${clst_ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null)" -- 2.26.2