From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 06C1A138C9D for ; Tue, 2 Jun 2015 17:01:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F564E0870; Tue, 2 Jun 2015 17:01:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0FFD8E0870 for ; Tue, 2 Jun 2015 17:01:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECF25340D0F for ; Tue, 2 Jun 2015 17:01:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A2E69A0C for ; Tue, 2 Jun 2015 17:01:39 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1433264477.9126e17807c290e45cdd46e66004177117ff1078.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: 9126e17807c290e45cdd46e66004177117ff1078 X-VCS-Branch: master Date: Tue, 2 Jun 2015 17:01:39 +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: a60349f4-96aa-458a-b461-3266aa6d27f9 X-Archives-Hash: b72e01e2d042c739293adea5b5ed5ec5 commit: 9126e17807c290e45cdd46e66004177117ff1078 Author: Mike Frysinger chromium org> AuthorDate: Tue Jun 2 17:00:30 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Jun 2 17:01:17 2015 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=9126e178 crossdev: support repo-name in layout.conf When building repos that only use repo-name in layout.conf, crossdev does not properly build the masters setting for its own layout.conf. Signed-off-by: Mike Frysinger chromium.org> crossdev | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crossdev b/crossdev index b5f9245..b501ad8 100755 --- a/crossdev +++ b/crossdev @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 CROSSDEV_VER="@CDEVPV@" @@ -1044,7 +1044,10 @@ set_metadata() { [[ -z ${d} ]] && continue name= - if [[ -e ${d}/profiles/repo_name ]] ; then + if [[ -e ${d}/metadata/layout.conf ]] ; then + name=$(awk '$1 == "repo-name" { print $3 }' "${d}/metadata/layout.conf") + fi + if [[ -z ${name} && -e ${d}/profiles/repo_name ]] ; then name=$(<"${d}"/profiles/repo_name) fi [[ -z ${name} ]] && continue