1 |
On Sat, Jul 15, 2017 at 8:00 PM, Peter Humphrey <peter@××××××××××××.uk> |
2 |
wrote: |
3 |
|
4 |
> Hello list, |
5 |
> |
6 |
> Today I get this: |
7 |
> |
8 |
> # emerge --sync |
9 |
> >>> Syncing repository 'gentoo' into '/usr/portage'... |
10 |
> /usr/bin/git pull |
11 |
> remote: Counting objects: 25, done. |
12 |
> remote: Compressing objects: 100% (9/9), done. |
13 |
> remote: Total 25 (delta 15), reused 25 (delta 15), pack-reused 0 |
14 |
> Unpacking objects: 100% (25/25), done. |
15 |
> From https://github.com/gentoo-mirror/gentoo |
16 |
> c80ef88a736..b9cb9e0b42e stable -> origin/stable |
17 |
> Updating c5ec29f674c..b9cb9e0b42e |
18 |
> error: Your local changes to the following files would be overwritten by |
19 |
> merge: |
20 |
> metadata/layout.conf |
21 |
> Please commit your changes or stash them before you merge. |
22 |
> Aborting |
23 |
> !!! git pull error in /usr/portage |
24 |
> |
25 |
> I can't imagine I'd ever make any changes to that file, e |
26 |
> |
27 |
|
28 |
Pretty sure mine is unmodified, so FWIW; |
29 |
$ grep ^[^#] /usr/portage/metadata/layout.conf |
30 |
manifest-hashes = SHA256 SHA512 WHIRLPOOL |
31 |
eapis-banned = 1 |
32 |
eapis-deprecated = 0 2 3 4 |
33 |
update-changelog = false |
34 |
cache-formats = md5-dict |
35 |
masters = |
36 |
thin-manifests = false |
37 |
sign-commits = false |
38 |
sign-manifests = false |
39 |
|
40 |
maybe just 'mv /usr/portage/metadata/layout.conf /root/layout.conf.orig' |
41 |
and see what happens. |