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 1S29ML-0005x7-31 for garchives@archives.gentoo.org; Mon, 27 Feb 2012 22:47:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0ABA9E08A5; Mon, 27 Feb 2012 22:47:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CE558E08A5 for ; Mon, 27 Feb 2012 22:47:24 +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 0FA651B4003 for ; Mon, 27 Feb 2012 22:47:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A164BE53FE for ; Mon, 27 Feb 2012 22:47:22 +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: <1330382698.55e07ef11873c874a3ccc4a9182889bc59f31475.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: 55e07ef11873c874a3ccc4a9182889bc59f31475 X-VCS-Branch: master Date: Mon, 27 Feb 2012 22:47:22 +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: aedc44a2-6616-4903-91a6-a7fde5408ac2 X-Archives-Hash: 83a975ba3eaf1dbe5f436565daa04a43 commit: 55e07ef11873c874a3ccc4a9182889bc59f31475 Author: Mike Frysinger gentoo org> AuthorDate: Mon Feb 27 22:42:38 2012 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Feb 27 22:44:58 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/crossdev.git;= a=3Dcommit;h=3D55e07ef1 crossdev: auto detect & enable thin-manifests If one of our source repos is using thin-manifests, automatically enable it in the crossdev one as well. URL: https://bugs.gentoo.org/404029 Reported-by: Jess Haas jesshaas.com> Signed-off-by: Mike Frysinger gentoo.org> --- crossdev | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/crossdev b/crossdev index faa48ed..45debb9 100755 --- a/crossdev +++ b/crossdev @@ -783,7 +783,7 @@ set_metadata() { local autogen_tag=3D"# Autogenerated and managed by crossdev" local meta=3D${CROSSDEV_OVERLAY}/metadata local layout=3D${meta}/layout.conf - local d name masters + local d name masters thin_manifests=3D"false" =20 mkdir -p "${meta}" if [[ -e ${layout} ]] ; then @@ -806,9 +806,30 @@ set_metadata() { fi [[ -z ${name} ]] && continue =20 + # If this repo has an eclass dir, mark it as a master if [[ -d ${d}/eclass ]] ; then has ${name} ${masters} || masters+=3D" ${name}" fi + + # If one of the overlays uses thin manifests, then turn it on + if [[ -z ${this_manifests} ]] && has ${name} ${masters} && \ + sed \ + -e 's:#.*::' \ + -e 's:^[[:space:]]*::' \ + -e 's:[[:space:]]*$::' \ + -e 's:[[:space:]]*=3D[[:space:]]*:=3D:' \ + "${d}/metadata/layout.conf" 2>/dev/null | \ + gawk -F=3D '{ + if ($1 =3D=3D "use-manifests") um =3D $2 + if ($1 =3D=3D "thin-manifests") tm =3D $2 + } + END { + exit !(um !=3D "false" && tm =3D=3D "true") + }' + then + einfo "enabling thin-manifests due to ${d}" + this_manifests=3D"use-manifests =3D true\nthin-manifests =3D true" + fi done =20 # write out that layout.conf! @@ -816,6 +837,7 @@ set_metadata() { ${autogen_tag} # Delete the above line if you want to manage this file yourself masters =3D${masters} + $(printf '%b' "${this_manifests}") EOF } =20