From f746a103a288685222576aa6f176dced0a818faf Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 7 Aug 2006 02:45:59 +0000 Subject: [PATCH] fix nested break and abort if user config not found #141640 Package-Manager: portage-2.1.1_pre4 --- sys-apps/busybox/Manifest | 30 +++++++++++++-------------- sys-apps/busybox/busybox-1.1.3.ebuild | 6 +++--- sys-apps/busybox/busybox-1.2.0.ebuild | 5 ++++- sys-apps/busybox/busybox-1.2.1.ebuild | 6 +++--- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index f218bede4393..f745b6f3f327 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -32,18 +32,18 @@ SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d files/co DIST busybox-1.1.3.tar.bz2 1435820 RMD160 b1e3409bc3180532af60140cdc5cfa84591c9641 SHA1 9feb01c74e370e7e59b6ccecd9cee2760435b462 SHA256 5228a88866211810c69d7a5be925cf87df47519b1d9d403aaca63bbdd32c975e DIST busybox-1.2.0.tar.bz2 1399041 RMD160 c9cc9cf3ad3f947519489c8492a845228a736438 SHA1 857ec4bec588af8f1f843472f02d2058a215f4bb SHA256 e066e6f526fd1a4473f4431a05848181d12056bd1c12456954a68f9b15a57624 DIST busybox-1.2.1.tar.bz2 1404986 RMD160 c9eb1637856a98278a4666f1c27db861477c31ca SHA1 487ef51209e253d3aa981dc0b0645063a804f4c7 SHA256 c6f955c7feafdb7c40645b3dc4c4a3c945477a2429633eef7b2a34ef01827410 -EBUILD busybox-1.1.3.ebuild 6715 RMD160 7ae9bac03c9fb1765f2c390090fbacc067a7b541 SHA1 7bdc5e81354ee5bafb6ca643281807d3ebee51ad SHA256 9ecf8315165a7dd3f89b2f8d39b2a0ff3a2ec45a60351ee458857e75a792095a -MD5 f4893b4882b938579f1fb45539b8b624 busybox-1.1.3.ebuild 6715 -RMD160 7ae9bac03c9fb1765f2c390090fbacc067a7b541 busybox-1.1.3.ebuild 6715 -SHA256 9ecf8315165a7dd3f89b2f8d39b2a0ff3a2ec45a60351ee458857e75a792095a busybox-1.1.3.ebuild 6715 -EBUILD busybox-1.2.0.ebuild 6617 RMD160 57ea02de9a4af9c9d764deabec391f0651e9db3e SHA1 81e9cea8436ab95cc3747538fc844a9e1c710afd SHA256 b1482558e35ba6b07ade3cbcb717737f721f31f053f37ac6e7a0786e6acf6daf -MD5 102ddb229fc1da47f58dd07d11c342bd busybox-1.2.0.ebuild 6617 -RMD160 57ea02de9a4af9c9d764deabec391f0651e9db3e busybox-1.2.0.ebuild 6617 -SHA256 b1482558e35ba6b07ade3cbcb717737f721f31f053f37ac6e7a0786e6acf6daf busybox-1.2.0.ebuild 6617 -EBUILD busybox-1.2.1.ebuild 6727 RMD160 3ebb1b8eadc96e72a804c1a73ec6a6fc4c4c0de5 SHA1 039466f1daf930a042ecfe8b5de33e1a47f36367 SHA256 81f25a259f2b2feb74a69c9e6a6b0b8732284bf16bd99367cc270361399cd5f6 -MD5 b7b839f272ba8870351e883708892fab busybox-1.2.1.ebuild 6727 -RMD160 3ebb1b8eadc96e72a804c1a73ec6a6fc4c4c0de5 busybox-1.2.1.ebuild 6727 -SHA256 81f25a259f2b2feb74a69c9e6a6b0b8732284bf16bd99367cc270361399cd5f6 busybox-1.2.1.ebuild 6727 +EBUILD busybox-1.1.3.ebuild 6695 RMD160 f46ade90e57b7c674ff39ef5c2f1983e4cf9d65e SHA1 c6cb96ca9892db6e6384f3bce7c16459d8121289 SHA256 ba9d36d40cb3e15faadc66d4ef2d407c1a1d4016ee71f41f652e4f14f996d9ca +MD5 093b4d8dcb3850190ac233867be2a3ae busybox-1.1.3.ebuild 6695 +RMD160 f46ade90e57b7c674ff39ef5c2f1983e4cf9d65e busybox-1.1.3.ebuild 6695 +SHA256 ba9d36d40cb3e15faadc66d4ef2d407c1a1d4016ee71f41f652e4f14f996d9ca busybox-1.1.3.ebuild 6695 +EBUILD busybox-1.2.0.ebuild 6707 RMD160 da3e865549c2ed793a5f3240d18911faa6193e29 SHA1 7eca3b79ce1061531a82489a5a8a0a8c44929f85 SHA256 72c3af794a63f05cb04ad3dfb3e12bdb74b68137800eecaa813b1e125529a3f0 +MD5 e133eebc04e3bee86c50250d25d2ba07 busybox-1.2.0.ebuild 6707 +RMD160 da3e865549c2ed793a5f3240d18911faa6193e29 busybox-1.2.0.ebuild 6707 +SHA256 72c3af794a63f05cb04ad3dfb3e12bdb74b68137800eecaa813b1e125529a3f0 busybox-1.2.0.ebuild 6707 +EBUILD busybox-1.2.1.ebuild 6707 RMD160 bac8dc9293cf566366db69ce520b2e758bfd1ea2 SHA1 d158c1be07c4305708d86f7c535f5dc466a2bc4e SHA256 b38102238290d0508be670dd307d56f56bafa3e013707f15ec36de5affdf7d62 +MD5 c4b01949dcf650ceb609ccdb932eca18 busybox-1.2.1.ebuild 6707 +RMD160 bac8dc9293cf566366db69ce520b2e758bfd1ea2 busybox-1.2.1.ebuild 6707 +SHA256 b38102238290d0508be670dd307d56f56bafa3e013707f15ec36de5affdf7d62 busybox-1.2.1.ebuild 6707 MISC ChangeLog 17032 RMD160 c93e5e41847c3463b789baa82ba2e04ad6b94926 SHA1 da28d9ab6d7a5b0f5634201e8fbc18b0ae0eb46c SHA256 f4ff54fc75d8294b475ae9b59794aee3503d5eb799c1ed34a2902ea6794e175c MD5 3f61a61b97252915cc78e93d615c78e6 ChangeLog 17032 RMD160 c93e5e41847c3463b789baa82ba2e04ad6b94926 ChangeLog 17032 @@ -64,7 +64,7 @@ SHA256 7cdd7cafb10a98988a5e4226f3b23246f785e3e624880789676f89fa362eb38b files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFE1Po9amhnQswr0vIRAnzsAJ4/TF1/xf9IsiaR8CZoqleTnU95jgCePTlb -aliwoMSe36XG1uDVCU/wVko= -=vXxa +iD8DBQFE1qlzamhnQswr0vIRAkr2AJ9Mp3/O/oe2QE6x0USJxGNKNUcd6wCgledW +//qQ5xZqtXL9rU4LIV474sA= +=IWux -----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-1.1.3.ebuild b/sys-apps/busybox/busybox-1.1.3.ebuild index 545282638a9b..f3eec6282a01 100644 --- a/sys-apps/busybox/busybox-1.1.3.ebuild +++ b/sys-apps/busybox/busybox-1.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.3.ebuild,v 1.13 2006/08/05 20:04:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.3.ebuild,v 1.14 2006/08/07 02:45:59 vapier Exp $ inherit eutils flag-o-matic @@ -77,14 +77,14 @@ src_unpack() { break fi done + [[ -e .config ]] && break done if [[ -r ${S}/.config ]] ; then einfo "Found your ${configfile} and using it." yes "" | make oldconfig > /dev/null return 0 else - einfo "Could not locate user configfile, going with default" - yes "" | make oldconfig > /dev/null + die "Could not locate user configfile, please fix" fi fi if use netboot ; then diff --git a/sys-apps/busybox/busybox-1.2.0.ebuild b/sys-apps/busybox/busybox-1.2.0.ebuild index a25bab7ab5f0..40a6248c12cc 100644 --- a/sys-apps/busybox/busybox-1.2.0.ebuild +++ b/sys-apps/busybox/busybox-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.2.0.ebuild,v 1.5 2006/08/05 20:04:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.2.0.ebuild,v 1.6 2006/08/07 02:45:59 vapier Exp $ inherit eutils flag-o-matic @@ -77,11 +77,14 @@ src_unpack() { break fi done + [[ -e .config ]] && break done if [[ -r ${S}/.config ]] ; then einfo "Found your ${configfile} and using it." yes "" | make oldconfig > /dev/null return 0 + else + die "Could not locate user configfile, please fix" fi fi if use netboot ; then diff --git a/sys-apps/busybox/busybox-1.2.1.ebuild b/sys-apps/busybox/busybox-1.2.1.ebuild index 454dd1abe00e..1a4621a364a4 100644 --- a/sys-apps/busybox/busybox-1.2.1.ebuild +++ b/sys-apps/busybox/busybox-1.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.2.1.ebuild,v 1.1 2006/08/05 20:06:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.2.1.ebuild,v 1.2 2006/08/07 02:45:59 vapier Exp $ inherit eutils flag-o-matic @@ -77,14 +77,14 @@ src_unpack() { break fi done + [[ -e .config ]] && break done if [[ -r ${S}/.config ]] ; then einfo "Found your ${configfile} and using it." yes "" | make oldconfig > /dev/null return 0 else - einfo "Could not locate user configfile, going with default" - yes "" | make oldconfig > /dev/null + die "Could not locate user configfile, please fix" fi fi if use netboot ; then -- 2.26.2