From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7CBDF139694 for ; Sat, 15 Jul 2017 10:05:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94AB1E0EB8; Sat, 15 Jul 2017 10:05:25 +0000 (UTC) Received: from mail-qk0-x22e.google.com (mail-qk0-x22e.google.com [IPv6:2607:f8b0:400d:c09::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 36196E0E5A for ; Sat, 15 Jul 2017 10:05:25 +0000 (UTC) Received: by mail-qk0-x22e.google.com with SMTP id v17so86166565qka.3 for ; Sat, 15 Jul 2017 03:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=fRTCZmnRaa8HaAVkIOL0API8544uZ2latketO+XZKbI=; b=ZmAdld/ossPvZPTxe82TdagO4T2abAF5gmWEXt2KoncPRozqCEt0AQEvG7zCbaZGE2 ArnTdyQBFCc/JU4Kveov3ejTyLqIcb0sttquLj5jf/TMTThK6pEZHFSWj2Ds2OY4Lnzj wQpUmGDabhf18zry42Yu79y7Gr6Ki0HvZUWeP39BVz4wCdgWrvqRriIi4x/YQOklthpj u1r8bmJ3KUHgfQLx2gv+TK7e8P8dDIdLe8Kfp29u6Fi5XgK3InuuSm7VSDLn5iOgUWvf wtJD0kVWPgoptEj2jzPq4x3DWtHUW1zHnkQlrnGiJl33ut/x3MH+4DdIdTN+La3fotfr D7NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=fRTCZmnRaa8HaAVkIOL0API8544uZ2latketO+XZKbI=; b=GRCUnQSivGQgkCNP1uA6H2KD+NHN4jH4m7zgvMv1MPHUumxIaAYGRHSUmHF7llNlVa gUfJM4iZ9B5vJg4ihdI8cgEVX0rBTP/IOa9nML/Hf2kjDI6YmS8iEwFYZ4UbVBzPiPnD vCCerEN5VjjU3r/4cA27AKFvo2Z5eB1GDiTgrHgwpp6tJ2+dqH8YHJMHQRxhMzNflJGF 3W2nGXKPD+54q0BM3cuuf+govAhGzXFVf9vrTVfLk2SWAQOLygCzDdGCWMf4M6FTkiR+ c5a+Qz3gJuOMHl1/VysCjZG2+52KDgeRgItQEfZvhOpWKw8CDZHFQt8l+bgp5m4ljCac cqtw== X-Gm-Message-State: AIVw112HLkxKA+Cz2fV3aYNMA2HKoCSANsGkkuARVF+QwvXvkWreR+cp 4Q/ZQp2csk3DSpbDW+EaWKWZCehAKLh0dWE= X-Received: by 10.55.131.129 with SMTP id f123mr17204422qkd.188.1500113124127; Sat, 15 Jul 2017 03:05:24 -0700 (PDT) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@lists.gentoo.org Reply-to: gentoo-user@lists.gentoo.org MIME-Version: 1.0 Received: by 10.12.177.106 with HTTP; Sat, 15 Jul 2017 03:05:23 -0700 (PDT) In-Reply-To: <2177616.rJ7vxfjn4A@peak> References: <2177616.rJ7vxfjn4A@peak> From: Adam Carter Date: Sat, 15 Jul 2017 20:05:23 +1000 Message-ID: Subject: Re: [gentoo-user] Can't emerge --sync To: "gentoo-user@lists.gentoo.org" Content-Type: multipart/alternative; boundary="94eb2c0746d0e2ff220554584dd3" X-Archives-Salt: 9af19248-57f7-49c6-ab00-9eda5048babc X-Archives-Hash: f50f9ad7f5eca6f59bdad90bcf28b0ad --94eb2c0746d0e2ff220554584dd3 Content-Type: text/plain; charset="UTF-8" On Sat, Jul 15, 2017 at 8:00 PM, Peter Humphrey 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. --94eb2c0746d0e2ff220554584dd3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On S= at, Jul 15, 2017 at 8:00 PM, Peter Humphrey <peter@prh.myzen.co.uk> wrote:
H= ello 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
=C2=A0 =C2=A0c80ef88a736..b9cb9e0b42e=C2=A0 stable=C2=A0 =C2=A0 =C2=A0->= origin/stable
Updating c5ec29f674c..b9cb9e0b42e
error: Your local changes to the following files would be overwritten by merge:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 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/po= rtage/metadata/layout.conf
manifest-hashes =3D SHA256 SHA512 WHIRLPOOL<= br>eapis-banned =3D 1
eapis-deprecated =3D 0 2 3 4
update-changelog = =3D false
cache-formats =3D md5-dict
masters =3D
thin-manifests = =3D false
sign-commits =3D false
sign-manifests =3D false

maybe just 'mv /usr/portage/metadata/layou= t.conf /root/layout.conf.orig' and see what happens.
--94eb2c0746d0e2ff220554584dd3--