Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/crossdev:master commit in: /
Date: Wed, 29 Feb 2012 16:22:47
Message-Id: 1330532522.072726d88e2c4b31f5249e45c5b3a33730eab3e0.vapier@gentoo
1 commit: 072726d88e2c4b31f5249e45c5b3a33730eab3e0
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 29 16:22:02 2012 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 29 16:22:02 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=072726d8
7
8 crossdev: reverse masters list in layout.conf
9
10 Portage reads this in reverse order, so we have to populate it in
11 reverse order as well.
12
13 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
14
15 ---
16 crossdev | 8 +++++---
17 1 files changed, 5 insertions(+), 3 deletions(-)
18
19 diff --git a/crossdev b/crossdev
20 index 68389d5..14515ca 100755
21 --- a/crossdev
22 +++ b/crossdev
23 @@ -848,9 +848,11 @@ set_metadata() {
24 fi
25 [[ -z ${name} ]] && continue
26
27 - # If this repo has an eclass dir, mark it as a master
28 + # If this repo has an eclass dir, mark it as a master.
29 + # Note: portage reads the masters list in reverse order,
30 + # so we have to prepare it the same way.
31 if [[ -d ${d}/eclass ]] ; then
32 - has ${name} ${masters} || masters+=" ${name}"
33 + has ${name} ${masters} || masters="${name} ${masters}"
34 fi
35
36 # If one of the overlays uses thin manifests, then turn it on
37 @@ -878,7 +880,7 @@ set_metadata() {
38 cat <<-EOF > "${layout}"
39 ${autogen_tag}
40 # Delete the above line if you want to manage this file yourself
41 - masters =${masters}
42 + masters = ${masters% }
43 $(printf '%b' "${this_manifests}")
44 EOF
45 }