commit:     62444e8d9f2c4d2e33a4bb281b29b44f2491ae88
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  9 13:36:37 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Sep  9 13:36:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=62444e8d

s/r-gen/update-rsync-master: don't add aliases to layout.conf

Portage triggers some weird path where it duplicates the repo conf under
a different name, leading to validation errors lateron.  It seems we
don't need this hack anymore, so remove it.

 scripts/rsync-generation/update-rsync-master.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/rsync-generation/update-rsync-master.sh 
b/scripts/rsync-generation/update-rsync-master.sh
index 14ffc0b..c9721c3 100755
--- a/scripts/rsync-generation/update-rsync-master.sh
+++ b/scripts/rsync-generation/update-rsync-master.sh
@@ -191,12 +191,6 @@ TIME_MANISIGN=$((STOP - START))
 echo "($(date +"%F %R")) setting repo_name and making the prefix profiles 
development ones (iso exp)"
 echo "gentoo_prefix" > "${RSYNCDIR}"/profiles/repo_name
 touch -r "${CVSDIR}"/profiles/repo_name "${RSYNCDIR}"/profiles/repo_name
-{
-       echo ""
-       echo "# Let the Prefix tree satisfy depends on the main gx86 tree"
-       echo "aliases = gentoo"
-} >> "${RSYNCDIR}"/metadata/layout.conf
-touch -r "${CVSDIR}"/metadata/layout.conf "${RSYNCDIR}"/metadata/layout.conf
 # reset Prefix profiles to dev status
 sed -i -e '/prefix/s/exp/dev/' "${RSYNCDIR}"/profiles/profiles.desc
 touch -r "${CVSDIR}"/profiles/profiles.desc 
"${RSYNCDIR}"/profiles/profiles.desc

Reply via email to