Re: [gentoo-user] Can't emerge --sync
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.
Re: [gentoo-user] Can't emerge --sync
On Sat, 15 Jul 2017 11:00:01 +0100 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, especially > not using git, but I tried reverting to backups of /var > and /usr/portage from a week ago, but I still get the same error. > Using backups from two weeks ago also made no difference. > > I sync and update every day, with never a problem like this before. > > Can anyone see what else I should try? Should I just delete the > offending file? (I'll get some coffee meanwhile...) > Why not just go there and do a "git diff"? It will show you what changed – maybe that gives an Idea what happened "git reset --hard" to reset the repository should solve that problem.
Re: [gentoo-user] Can't emerge --sync
On Sat, Jul 15, 2017 at 1: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, especially not using > git, but I tried reverting to backups of /var and /usr/portage from a week > ago, but I still get the same error. Using backups from two weeks ago also > made no difference. > > I sync and update every day, with never a problem like this before. > > Can anyone see what else I should try? Should I just delete the offending > file? (I'll get some coffee meanwhile...) > > -- > Regards > Peter > > git-checkout(1) has a '--theirs' option that might do the trick there: The index may contain unmerged entries because of a previous failed merge. By default, if you try to check out such an entry from the index, the checkout operation will fail and nothing will be checked out. ... You could try: git checkout --theirs metadata/layout.conf
Re: [gentoo-user] Can't emerge --sync
On Saturday 15 Jul 2017 12:14:52 Daniel Wagener wrote: > On Sat, 15 Jul 2017 11:00:01 +0100 > > 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, especially > > not using git, but I tried reverting to backups of /var > > and /usr/portage from a week ago, but I still get the same error. > > Using backups from two weeks ago also made no difference. > > > > I sync and update every day, with never a problem like this before. > > > > Can anyone see what else I should try? Should I just delete the > > offending file? (I'll get some coffee meanwhile...) > > Why not just go there and do a "git diff"? > It will show you what changed – maybe that gives an Idea what happened It showed me that I'd changed "masters =" to "masters = gentoo" in layout.conf, which I knew because I'd been told to at some time. But I did that ages ago, long before my last sync yesterday, so what else has changed? I didn't emerge anything yesterday, as confirmed by "grep completed /var/log/emerge.log" (so it wasn't a failed emerge, Alexander). > "git reset --hard" to reset the repository should solve that problem. It has - thanks Daniel. I haven't tried to understand the ins and outs of git, I just use it blindly for --sync. -- Regards Peter
Re: [gentoo-user] Can't emerge --sync
Am Samstag, 15. Juli 2017, 15:11:03 CEST schrieb Peter Humphrey: > On Saturday 15 Jul 2017 12:14:52 Daniel Wagener wrote: > > On Sat, 15 Jul 2017 11:00:01 +0100 > > > > Peter Humphrey wrote: [...] > > > > Why not just go there and do a "git diff"? > > It will show you what changed – maybe that gives an Idea what happened > > It showed me that I'd changed "masters =" to "masters = gentoo" in > layout.conf, which I knew because I'd been told to at some time. That's ridiculous. You're configuring the main portage tree to be a master of itself. Search for "masters" in portage(5) for an explanation of what that option is for (it's mainly interesting for overlays). > But I did > that ages ago, long before my last sync yesterday, so what else has changed? > I didn't emerge anything yesterday, as confirmed by "grep completed > /var/log/emerge.log" (so it wasn't a failed emerge, Alexander). What probably happened is that this is the first time something changed in layout.conf since you added the "masters" line, thus why git never complained. > > "git reset --hard" to reset the repository should solve that problem. > > It has - thanks Daniel. I haven't tried to understand the ins and outs of > git, I just use it blindly for --sync. Since git is a version control system, it won't blindly overwrite local changes, so it's best not to make any :) (so don't add that change back in, since it's pointless anyway). Always use your own overlay if you want to make changes. HTH -- Marc Joliet -- "People who think they know everything really annoy those of us who know we don't" - Bjarne Stroustrup signature.asc Description: This is a digitally signed message part.
Re: [gentoo-user] Can't emerge --sync
On Saturday 15 Jul 2017 16:07:26 Marc Joliet wrote: > Am Samstag, 15. Juli 2017, 15:11:03 CEST schrieb Peter Humphrey: > > On Saturday 15 Jul 2017 12:14:52 Daniel Wagener wrote: > > > On Sat, 15 Jul 2017 11:00:01 +0100 > > > Peter Humphrey wrote: > [...] > > > Why not just go there and do a "git diff"? > > > It will show you what changed – maybe that gives an Idea what happened > > > > It showed me that I'd changed "masters =" to "masters = gentoo" in > > layout.conf, which I knew because I'd been told to at some time. > > That's ridiculous. You're configuring the main portage tree to be a > master of itself. Search for "masters" in portage(5) for an explanation > of what that option is for (it's mainly interesting for overlays). Nevertheless, I did only follow an instruction in a Gentoo wiki page. It said the change was "for future compatibility" or some such. I wouldn't just have made it up for myself. --->8 > What probably happened is that this is the first time something changed in > layout.conf since you added the "masters" line, thus why git never > complained. --->8 > Since git is a version control system, it won't blindly overwrite local > changes, so it's best not to make any :) (so don't add that change back > in, since it's pointless anyway). Always use your own overlay if you > want to make changes. > > HTH Yes. Thanks. -- Regards Peter
Re: [gentoo-user] Can't emerge --sync
(I've got a bad habit of saving unfinished emails in the drafts folder and then forgetting about them. I found this one while cleaning it up and thought it might still be informative.) Am Samstag, 15. Juli 2017, 17:47:18 CEST schrieb Peter Humphrey: > On Saturday 15 Jul 2017 16:07:26 Marc Joliet wrote: > > Am Samstag, 15. Juli 2017, 15:11:03 CEST schrieb Peter Humphrey: > > > On Saturday 15 Jul 2017 12:14:52 Daniel Wagener wrote: > > > > On Sat, 15 Jul 2017 11:00:01 +0100 > > > > > > Peter Humphrey wrote: > > [...] > > > > > > Why not just go there and do a "git diff"? > > > > It will show you what changed – maybe that gives an Idea what happened > > > > > > It showed me that I'd changed "masters =" to "masters = gentoo" in > > > layout.conf, which I knew because I'd been told to at some time. > > > > That's ridiculous. You're configuring the main portage tree to be a > > master of itself. Search for "masters" in portage(5) for an explanation > > of what that option is for (it's mainly interesting for overlays). > > Nevertheless, I did only follow an instruction in a Gentoo wiki page. It > said the change was "for future compatibility" or some such. I wouldn't just > have made it up for myself. Hmm, now that you mention it, I vaguely remember something like that. (Also, for a better explanation of masters, see [0].) Searching for it now (longer than I should have), I see it's a warning from portage that you get when you leave it out completely. > --->8 > > > What probably happened is that this is the first time something changed in > > layout.conf since you added the "masters" line, thus why git never > > complained. > > --->8 > > > Since git is a version control system, it won't blindly overwrite local > > changes, so it's best not to make any :) (so don't add that change back > > in, since it's pointless anyway). Always use your own overlay if you > > want to make changes. > > > > HTH > > Yes. Thanks. [0] https://wiki.gentoo.org/wiki/Repository_format/metadata/layout.conf#masters -- Marc Joliet -- "People who think they know everything really annoy those of us who know we don't" - Bjarne Stroustrup signature.asc Description: This is a digitally signed message part.
Re: [gentoo-user] can't emerge --sync
On Mon, 15 May 2006 10:30:46 -0300, Matias Grana wrote: > Beginning a week ago or so, I can't emerge --sync anymore. It always > quits with a timeout error. Like this: Try a different rsync server. -- Neil Bothwick This is as bad as it can get-but don't bet on it. signature.asc Description: PGP signature
Re: [gentoo-user] can't emerge --sync
On 10:30 Mon 15 May , Matias Grana wrote: > hi; > Beginning a week ago or so, I can't emerge --sync anymore. It always > quits with a timeout error. Like this: > > receiving file list ... > 143979 files to consider > rsync error: timeout in data send/receive (code 30) at io.c(171) > [sender=2.6.8] > rsync: connection unexpectedly closed (3358508 bytes received so far) > [receiver] > rsync error: error in rsync protocol data stream (code 12) at io.c(463) > [receiver=2.6.8] > rsync: connection unexpectedly closed (3358508 bytes received so far) > [generator] > rsync error: error in rsync protocol data stream (code 12) at io.c(463) > [generator=2.6.8] > >>> retry ... > I'm pretty likely not the best person to help you out but, I'm wondering... Have you tried with any other mirror? Does it still happen? > Judging by the number of files, I'd think it just finished updating > the tree; but it timeouts anyway. Playing with RSYNC_TIMEOUT at > /etc/make.conf doesn't seem to help either. > > OTOH, emerge-webrsync works fine. > Any thoughts? > > TIA, > -- > Matías Graña > [EMAIL PROTECTED] > -- > gentoo-user@gentoo.org mailing list -- Pablo Antonio (AKA crazy2k) http://www.pablo-a.com.ar/ -- gentoo-user@gentoo.org mailing list
Re: [gentoo-user] can't emerge --sync
> On 10:30 Mon 15 May , Matias Grana wrote: > > hi; > > Beginning a week ago or so, I can't emerge --sync anymore. It always > > quits with a timeout error. Like this: > > > > receiving file list ... > > 143979 files to consider > > rsync error: timeout in data send/receive (code 30) at io.c(171) > > [sender=2.6.8] > > rsync: connection unexpectedly closed (3358508 bytes received so far) > > [receiver] > > rsync error: error in rsync protocol data stream (code 12) at io.c(463) > > [receiver=2.6.8] > > rsync: connection unexpectedly closed (3358508 bytes received so far) > > [generator] > > rsync error: error in rsync protocol data stream (code 12) at io.c(463) > > [generator=2.6.8] > > >>> retry ... On Mon, May 15, 2006 at 03:37:54PM +0100, Neil Bothwick wrote: > Try a different rsync server. > -- > Neil Bothwick On Mon, May 15, 2006 at 11:19:36AM -0300, Pablo Antonio wrote: > I'm pretty likely not the best person to help you out but, I'm > wondering... Have you tried with any other mirror? Does it still happen? I tried with SYNC="rsync://rsync.gentoo.org/gentoo-portage" SYNC="rsync://rsync.samerica.gentoo.org/gentoo-portage" SYNC="rsync://rsync.namerica.gentoo.org/gentoo-portage" with no luck. If it's just a matter of non-permanent congestion, I can live with emerge-webrsync. Anyway, I was wondering whether there was a different approach. By the way, Pablo: it seems that we are very close to each other. Which mirror do you use? Thanks, Matias -- gentoo-user@gentoo.org mailing list
Re: [gentoo-user] can't emerge --sync
On 13:02 Mon 15 May , Matias Grana wrote: > > On 10:30 Mon 15 May , Matias Grana wrote: > > > hi; > > > Beginning a week ago or so, I can't emerge --sync anymore. It always > > > quits with a timeout error. Like this: > > > > > > receiving file list ... > > > 143979 files to consider > > > rsync error: timeout in data send/receive (code 30) at io.c(171) > > > [sender=2.6.8] > > > rsync: connection unexpectedly closed (3358508 bytes received so far) > > > [receiver] > > > rsync error: error in rsync protocol data stream (code 12) at io.c(463) > > > [receiver=2.6.8] > > > rsync: connection unexpectedly closed (3358508 bytes received so far) > > > [generator] > > > rsync error: error in rsync protocol data stream (code 12) at io.c(463) > > > [generator=2.6.8] > > > >>> retry ... > > > On Mon, May 15, 2006 at 03:37:54PM +0100, Neil Bothwick wrote: > > Try a different rsync server. > > -- > > Neil Bothwick > > > On Mon, May 15, 2006 at 11:19:36AM -0300, Pablo Antonio wrote: > > I'm pretty likely not the best person to help you out but, I'm > > wondering... Have you tried with any other mirror? Does it still happen? > > I tried with > SYNC="rsync://rsync.gentoo.org/gentoo-portage" > SYNC="rsync://rsync.samerica.gentoo.org/gentoo-portage" > SYNC="rsync://rsync.namerica.gentoo.org/gentoo-portage" > > with no luck. If it's just a matter of non-permanent congestion, I can > live with emerge-webrsync. Anyway, I was wondering whether there was a > different approach. > > By the way, Pablo: it seems that we are very close to each other. Which > mirror do you use? > I use the second you've pasted there, and I have no problems. Check if it gets fixed by upgrading portage. If it doesn't I'd start to think the problem is your connection to the Internet, or most likely your configuration. -- Pablo Antonio (AKA crazy2k) http://www.pablo-a.com.ar/ -- gentoo-user@gentoo.org mailing list
Re: [gentoo-user] can't emerge --sync
On 5/15/06, Pablo Antonio <[EMAIL PROTECTED]> wrote: On 13:02 Mon 15 May , Matias Grana wrote: > > On 10:30 Mon 15 May , Matias Grana wrote: > > > hi; > > > Beginning a week ago or so, I can't emerge --sync anymore. It always > > > quits with a timeout error. Like this: > > > > > > receiving file list ... > > > 143979 files to consider > > > rsync error: timeout in data send/receive (code 30) at io.c(171) [sender=2.6.8] > > > rsync: connection unexpectedly closed (3358508 bytes received so far) [receiver] > > > rsync error: error in rsync protocol data stream (code 12) at io.c(463) [receiver=2.6.8] > > > rsync: connection unexpectedly closed (3358508 bytes received so far) [generator] > > > rsync error: error in rsync protocol data stream (code 12) at io.c(463) [generator=2.6.8] > > > >>> retry ... > I had the same problem and re-emerging rsync solved it. Good luck! -- Louis Brazeau Informaticien -- gentoo-user@gentoo.org mailing list