From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S3Aya-00080T-Ec for garchives@archives.gentoo.org; Thu, 01 Mar 2012 18:43:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65096E07C6; Thu, 1 Mar 2012 18:43:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 34E7AE07C6 for ; Thu, 1 Mar 2012 18:43:17 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 981971B402C for ; Thu, 1 Mar 2012 18:43:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3E72FE542A for ; Thu, 1 Mar 2012 18:43:14 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1330579656.a0721f00c837abdc835843dc44d23a967d96dba4.vapier@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: / X-VCS-Repository: proj/crossdev X-VCS-Files: crossdev X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: a0721f00c837abdc835843dc44d23a967d96dba4 X-VCS-Branch: master Date: Thu, 1 Mar 2012 18:43: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 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: aa63dc01-df34-40d4-ad20-0f2eb31cd263 X-Archives-Hash: bef838f23da40640bd32a8741e0d64c4 commit: a0721f00c837abdc835843dc44d23a967d96dba4 Author: Mike Frysinger gentoo org> AuthorDate: Thu Mar 1 00:18:09 2012 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Mar 1 05:27:36 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/crossdev.git;= a=3Dcommit;h=3Da0721f00 crossdev: reject flat files in PORTAGE_CONFIGROOT It's getting to be too much of a hassle to support flat files in PORTAGE_CONFIGROOT (I'm lazy), so start rejecting setups that try to do that. It's trivial for people to convert over to dirs. Signed-off-by: Mike Frysinger gentoo.org> --- crossdev | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/crossdev b/crossdev index 65bd433..1c9a5b7 100755 --- a/crossdev +++ b/crossdev @@ -310,14 +310,10 @@ uninstall() { =20 [[ -d ${CROSSDEV_OVERLAY}/cross-${CTARGET} ]] \ && rm -r ${CROSSDEV_OVERLAY}/cross-${CTARGET} + local f for f in categories package.{mask,keywords,use} profile/package.use.{fo= rce,mask} ; do - f=3D"${CONFIGROOT}/${f}" - if [[ -d ${f} ]] ; then - rm -f "${f}"/cross-${CTARGET} - rmdir "${f}" 2>/dev/null - elif [[ -f ${f} ]] ; then - sed -i -r -e "/^cross-${CTARGET}(\/|$)/d" "${f}" - fi + rm -f "${f}"/cross-${CTARGET} + rmdir "${f}" 2>/dev/null done rm -rf "${CONFIGROOT}"/env/cross-${CTARGET} rmdir "${CONFIGROOT}"/env 2>/dev/null @@ -899,8 +895,8 @@ grep -qs "^cross-${CTARGET}$" "${CONFIGROOT}"/categor= ies \ mkdir -p "${CROSSDEV_OVERLAY}"/cross-${CTARGET} || exit 1 cd "${CONFIGROOT}" for f in package.{keywords,mask,use} env/cross-${CTARGET} profile/packag= e.use.{force,mask} ; do - [[ -f ${f} ]] && continue - mkdir -p ${f} || exit 1 + [[ -f ${f} ]] && die "please convert ${CONFIGROOT}/${f} to a directory" + mkdir -p ${f} || die "wtf!?" rm -f ${f}/cross-${CTARGET} done =20