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 C7B81139085 for ; Mon, 2 Jan 2017 20:40:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 343A3E0D7C; Mon, 2 Jan 2017 20:40:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01478E0D7C for ; Mon, 2 Jan 2017 20:40:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C3F1341027 for ; Mon, 2 Jan 2017 20:40:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A721261C for ; Mon, 2 Jan 2017 20:39:59 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1483388695.73c852a0c1f0e906fc0a9af64aa642b96bed73e7.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_compile.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 73c852a0c1f0e906fc0a9af64aa642b96bed73e7 X-VCS-Branch: master Date: Mon, 2 Jan 2017 20:39:59 +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: e1264660-76b2-4c05-bff2-73faafb6030e X-Archives-Hash: a585429f56146959c58388f324902c39 commit: 73c852a0c1f0e906fc0a9af64aa642b96bed73e7 Author: Robin H. Johnson gentoo org> AuthorDate: Mon Jan 2 20:24:55 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Jan 2 20:24:55 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=73c852a0 Revert "clean up an if statement" This reverts commit a22f45125393935e2e0a50cdfc303440cdc946d4. The first if statement checks if busybox cache exists, and if so, does it need to be invalidated (rm the cache file). The second if statement checks if the cache does NOT exist, and builds the new busybox cache. gen_compile.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gen_compile.sh b/gen_compile.sh index 70a6732..a730d77 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -424,7 +424,10 @@ compile_busybox() { else print_info 1 "busybox: >> Using cache" fi - else + fi + + if [ ! -f "${BUSYBOX_BINCACHE}" ] + then cd "${TEMP}" rm -rf "${BUSYBOX_DIR}" > /dev/null /bin/tar -jxpf ${BUSYBOX_SRCTAR} ||