| 1 |
commit: 9126e17807c290e45cdd46e66004177117ff1078 |
| 2 |
Author: Mike Frysinger <vapier <AT> chromium <DOT> org> |
| 3 |
AuthorDate: Tue Jun 2 17:00:30 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 2 17:01:17 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=9126e178 |
| 7 |
|
| 8 |
crossdev: support repo-name in layout.conf |
| 9 |
|
| 10 |
When building repos that only use repo-name in layout.conf, crossdev |
| 11 |
does not properly build the masters setting for its own layout.conf. |
| 12 |
|
| 13 |
Signed-off-by: Mike Frysinger <vapier <AT> chromium.org> |
| 14 |
|
| 15 |
crossdev | 7 +++++-- |
| 16 |
1 file changed, 5 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/crossdev b/crossdev |
| 19 |
index b5f9245..b501ad8 100755 |
| 20 |
--- a/crossdev |
| 21 |
+++ b/crossdev |
| 22 |
@@ -1,5 +1,5 @@ |
| 23 |
#!/bin/bash |
| 24 |
-# Copyright 1999-2014 Gentoo Foundation |
| 25 |
+# Copyright 1999-2015 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
CROSSDEV_VER="@CDEVPV@" |
| 29 |
@@ -1044,7 +1044,10 @@ set_metadata() { |
| 30 |
[[ -z ${d} ]] && continue |
| 31 |
|
| 32 |
name= |
| 33 |
- if [[ -e ${d}/profiles/repo_name ]] ; then |
| 34 |
+ if [[ -e ${d}/metadata/layout.conf ]] ; then |
| 35 |
+ name=$(awk '$1 == "repo-name" { print $3 }' "${d}/metadata/layout.conf") |
| 36 |
+ fi |
| 37 |
+ if [[ -z ${name} && -e ${d}/profiles/repo_name ]] ; then |
| 38 |
name=$(<"${d}"/profiles/repo_name) |
| 39 |
fi |
| 40 |
[[ -z ${name} ]] && continue |
Archives