On Sat, Jul 15, 2017 at 8:00 PM, Peter Humphrey <pe...@prh.myzen.co.uk> wrote:
> Hello list, > > Today I get this: > > # emerge --sync > >>> Syncing repository 'gentoo' into '/usr/portage'... > /usr/bin/git pull > remote: Counting objects: 25, done. > remote: Compressing objects: 100% (9/9), done. > remote: Total 25 (delta 15), reused 25 (delta 15), pack-reused 0 > Unpacking objects: 100% (25/25), done. > From https://github.com/gentoo-mirror/gentoo > c80ef88a736..b9cb9e0b42e stable -> origin/stable > Updating c5ec29f674c..b9cb9e0b42e > error: Your local changes to the following files would be overwritten by > merge: > metadata/layout.conf > Please commit your changes or stash them before you merge. > Aborting > !!! git pull error in /usr/portage > > I can't imagine I'd ever make any changes to that file, e > Pretty sure mine is unmodified, so FWIW; $ grep ^[^#] /usr/portage/metadata/layout.conf manifest-hashes = SHA256 SHA512 WHIRLPOOL eapis-banned = 1 eapis-deprecated = 0 2 3 4 update-changelog = false cache-formats = md5-dict masters = thin-manifests = false sign-commits = false sign-manifests = false maybe just 'mv /usr/portage/metadata/layout.conf /root/layout.conf.orig' and see what happens.
