Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 567074 - emerge --sync [rsync] fails because .git folder is distributed: "/usr/portage appears to be under revision control (contains .git)."
Summary: emerge --sync [rsync] fails because .git folder is distributed: "/usr/portage...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Infrastructure
Classification: Unclassified
Component: Git (show other bugs)
Hardware: All Linux
: Highest critical (vote)
Assignee: Gentoo Infrastructure
URL:
Whiteboard:
Keywords:
: 567076 567922 (view as bug list)
Depends on:
Blocks:
 
Reported: 2015-11-29 06:19 UTC by Marcus Schwartz
Modified: 2015-12-10 14:37 UTC (History)
11 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Marcus Schwartz 2015-11-29 06:19:33 UTC
Today's portage snapshot contains a .git folder.  This prevents future syncs from running.

Reproducible: Always

Steps to Reproduce:
1. Run "emerge sync" or otherwise install the  20151128 snapshot of the portage tree.
2. Observe that there is now a /usr/portage/.git folder
3. Run "emerge sync" again
Actual Results:  
>>> Syncing repository 'gentoo' into '/usr/portage'...
!!! /usr/portage appears to be under revision control (contains .git).
!!! Aborting rsync sync.

Expected Results:  
The portage tree shouldn't include data that prevents future syncs from working.
Comment 1 Marcus Schwartz 2015-11-29 06:24:59 UTC
Just in case anybody finds this bug and thinks they can never sync again:  You can recover with "rm -r /usr/portage/.git"
Comment 2 Tomáš Mózes 2015-11-29 07:10:09 UTC
*** Bug 567076 has been marked as a duplicate of this bug. ***
Comment 3 Matthias Maier gentoo-dev 2015-11-29 07:16:29 UTC
(clone15247) #amd64 jackdaw repos.conf # emerge --sync
(clone15247) #amd64 jackdaw repos.conf # emerge --sync
>>> Syncing repository 'gentoo' into '/portage'...
!!! /portage appears to be under revision control (contains .git).
!!! Aborting rsync sync.

... and dead.


Escalating severity. This is a major show stopper...
Comment 4 Matthias Maier gentoo-dev 2015-11-29 07:26:40 UTC
Assigning to bug with discussion.

*** This bug has been marked as a duplicate of bug 557516 ***
Comment 5 Alex Legler (RETIRED) archtester gentoo-dev Security 2015-11-29 13:37:02 UTC
I've applied a potential fix which can only propagate once the manifest for liblxqt (bug 567102) is fixed.
Comment 6 Mike DeSimone 2015-11-29 14:27:48 UTC
When cleaning up, remember to remove /usr/portage/.gitignore, not just /usr/portage/.git. Though I wonder if there are other not-belonging files as well.
Comment 7 Alex Legler (RETIRED) archtester gentoo-dev Security 2015-11-30 09:03:00 UTC
Issue resolved. Instructions to fix will stay up for a bit: https://infra-status.gentoo.org/notice/20151129-rsync
Comment 8 Alex Legler (RETIRED) archtester gentoo-dev Security 2015-12-10 09:46:39 UTC
*** Bug 567922 has been marked as a duplicate of this bug. ***
Comment 9 Alex Legler (RETIRED) archtester gentoo-dev Security 2015-12-10 14:37:01 UTC
*** Bug 567922 has been marked as a duplicate of this bug. ***