[gentoo-portage-dev] [PATCH] Add .git dir to excluded dirs in default PORTAGE_RSYNC_OPTS

[gentoo-portage-dev] [PATCH] Add .git dir to excluded dirs in default PORTAGE_RSYNC_OPTS

[NP-Hardass]

[-- Attachment #1: Type: text/plain, Size: 2446 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Based off of git master at Mon Dec 14 02:36:31 UTC 2015, commit
7cbd04cd62c8f13ed41e07ff8bc9b7e5d5ac700b


- - From b49fba5c16a931d3ab041446dd8aeba4d2403260 Mon Sep 17 00:00:00 2001
From: NP-Hardass <NP-Hardass@gentoo.org>
Date: Sun, 13 Dec 2015 21:20:39 -0500
Subject: [PATCH] Add .git dir to excluded dirs in default PORTAGE_RSYNC_OPTS

Adding the .git dir to the default exclude dirs should have no ill side
effects as rsync is not allowed when .git dirs are present and should,
on the user's side prevent future potential sync issues like those that
we recently experienced.
- - ---
 cnf/make.globals | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 82d8cc1..836bb5c 100644
- - --- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -92,7 +92,7 @@ PORTAGE_RSYNC_RETRIES="-1"
 # Number of seconds rsync will wait before timing out.
 #RSYNC_TIMEOUT="180"
 
- - -PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
+PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
 
 # The number of days after the last `emerge --sync` that a warning
 # message should be produced.
- - -- 
2.6.4


- - -- 
NP-Hardass
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWbjLHAAoJEBzZQR2yrxj7/v0P/3NAxycwWB+EyLmTRTJI3whL
VLlN+oW3Pvw+PInnv23o/cMlfH3i8wNgi6syaWj+z6guasN0vC3pGJ9XCTo7SJW5
BKUEL8tzbQFa8W5k0nK9IkCOrEvqartBep9KLu8vj2SUQ4xRcEWk/uBksczJ+13g
CzP3kDdJmKGWZHER8+viwQ6tVNKxJW41SwQG5pz4emfADyceQnu/iy9SlRk8PsOD
LfHbuoZTv6YejuA8sDj09vRiNGfEwjuDTqBvjUziHdDg8J9is+vtmj04dqf05ZBR
PrEpoPo5FulGMzQjfF7dgyTpzM5pHBkxvPwM2U3HupnV1H5xixpXkNMEYQ6V3zK+
Max5LbOpzMzHdAx7+gYSRHC4pUa6FTy9lvEqgBfgDG7niq82HADltEruoFT0PRzX
ggRqxGJtRStrwHJDBGRNGdmOelmzI5FCC1497GdlOIvRdiRxvmIdlConVvWD5cii
FbaZsTxrV36NRUXCvR8G9hHLjJUPAjXMU3Ri+huCn0KjDN705envnBhF0LbJ3bvj
jRA/5KDLJcwPMOneEMp5Vb4SQJtC7n3OG1oxaqdQoZ4pu61i0LVdoEe5JpuHtKkM
g0PL7S+J8AA1eBTIlcYnsuwDt1QeAPq5eyHnQfBwF2ptKmRjNz3dPf4VNzM+ZYcW
xZDbhRKNifiWTq6Ee0Ee
=1vMD
-----END PGP SIGNATURE-----

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Add-.git-dir-to-excluded-dirs-in-default-PORTAGE_RSY.patch --]
[-- Type: text/x-patch, Size: 1404 bytes --]

From b49fba5c16a931d3ab041446dd8aeba4d2403260 Mon Sep 17 00:00:00 2001
From: NP-Hardass <NP-Hardass@gentoo.org>
Date: Sun, 13 Dec 2015 21:20:39 -0500
Subject: [PATCH] Add .git dir to excluded dirs in default PORTAGE_RSYNC_OPTS

Adding the .git dir to the default exclude dirs should have no ill side
effects as rsync is not allowed when .git dirs are present and should,
on the user's side prevent future potential sync issues like those that
we recently experienced.
---
 cnf/make.globals | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 82d8cc1..836bb5c 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -92,7 +92,7 @@ PORTAGE_RSYNC_RETRIES="-1"
 # Number of seconds rsync will wait before timing out.
 #RSYNC_TIMEOUT="180"
 
-PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
+PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
 
 # The number of days after the last `emerge --sync` that a warning
 # message should be produced.
-- 
2.6.4

Re: [gentoo-portage-dev] [PATCH] Add .git dir to excluded dirs in default PORTAGE_RSYNC_OPTS

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On 14/12/15 04:08, NP-Hardass wrote:
> like those that we recently experienced.
I don't know what this is in reference too, so it should be explained
better.

I have no real objects on the patch, but defer the ACK to Brian. Could
you have a look, please?
- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCgAGBQJWbsDbAAoJENQqWdRUGk8BgygP/39NehkpCmrQ2iMPkmkZS2Le
HS81r1PoCoklIdlOtwzjNT7G1Tw2UCCxaE4BLXw8Mh56OroESHc4DOKNKfFwE/TZ
Oeesz3sxMrKdqbM3q60HM6nKoeJYB0XOcBkOJ1chuMUB509BCRDwAraEnS2QtA9/
athwFcMIuGx8nO4wYQTxFSeeoNKewbi7jA+SnPXjtrLaSRvlL/KS8HBrWqtWAsUt
tXUyZhSRGA/cIfIGPuIGQonhc9H/n1Wh9HmqtmiK/A0UoNC0yA6JToVCbC7KUT7O
Hf52lkWfU+MW3T5IThFKOMjUQRacK85onW51ux0hOxelkOn+l8acyReizfz1E+uj
rYGwmGnb5ytV42PmX7XjmMPXWezO/KnTzOuqZ7+OSPzu4wazYLjFr7Wg1szAzJa8
y/SjDtnH1gZ0OGeGDBbWLdw8vlb9NqzeQGXzLL1ZSqvmo5ZgQCRA+StCi6B4iNWD
+G3hATa9x20aHZJRoMMGqzutY/mHta2zWrBBsFpH10MuULS1wkQrqWCJKWDa0Bdo
9BQF0SFvvFiDp2EeT4KbOynYYqrliyhFa+FhiSbA56tHTtWVor+wmHzHO25lazAQ
5Rni+ZVUNbRaukkRJ3hmVQa1f9osnHazGX3C6MQaqw3m/3DlGWOCt3CuN34R88lO
Q7lAJhbYs8ZgSPb4xcQX
=QPRz
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH] Add .git dir to excluded dirs in default PORTAGE_RSYNC_OPTS

[NP-Hardass]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

My apologies for the ambiguity.  I didn't realize there was a bug on
bugzilla regarding the original incident.
https://bugs.gentoo.org/show_bug.cgi?id=567074
The .git directory was pushed out over rsync, portage refused to sync
via rsync once it had a .git dir, and so rsync was broken for users for
a period of time.  So this is effectively a user-side remeditation to
reinforce the already taken server-side remediation.

On Mon, 14 Dec 2015 14:15:08 +0100
Alexander Berntsen <bernalex@gentoo.org> wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA512
> 
> On 14/12/15 04:08, NP-Hardass wrote:
> > like those that we recently experienced.  
> I don't know what this is in reference too, so it should be explained
> better.
> 
> I have no real objects on the patch, but defer the ACK to Brian. Could
> you have a look, please?
> - -- 
> Alexander
> bernalex@gentoo.org
> https://secure.plaimi.net/~alexander
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2
> 
> iQIcBAEBCgAGBQJWbsDbAAoJENQqWdRUGk8BgygP/39NehkpCmrQ2iMPkmkZS2Le
> HS81r1PoCoklIdlOtwzjNT7G1Tw2UCCxaE4BLXw8Mh56OroESHc4DOKNKfFwE/TZ
> Oeesz3sxMrKdqbM3q60HM6nKoeJYB0XOcBkOJ1chuMUB509BCRDwAraEnS2QtA9/
> athwFcMIuGx8nO4wYQTxFSeeoNKewbi7jA+SnPXjtrLaSRvlL/KS8HBrWqtWAsUt
> tXUyZhSRGA/cIfIGPuIGQonhc9H/n1Wh9HmqtmiK/A0UoNC0yA6JToVCbC7KUT7O
> Hf52lkWfU+MW3T5IThFKOMjUQRacK85onW51ux0hOxelkOn+l8acyReizfz1E+uj
> rYGwmGnb5ytV42PmX7XjmMPXWezO/KnTzOuqZ7+OSPzu4wazYLjFr7Wg1szAzJa8
> y/SjDtnH1gZ0OGeGDBbWLdw8vlb9NqzeQGXzLL1ZSqvmo5ZgQCRA+StCi6B4iNWD
> +G3hATa9x20aHZJRoMMGqzutY/mHta2zWrBBsFpH10MuULS1wkQrqWCJKWDa0Bdo
> 9BQF0SFvvFiDp2EeT4KbOynYYqrliyhFa+FhiSbA56tHTtWVor+wmHzHO25lazAQ
> 5Rni+ZVUNbRaukkRJ3hmVQa1f9osnHazGX3C6MQaqw3m/3DlGWOCt3CuN34R88lO
> Q7lAJhbYs8ZgSPb4xcQX
> =QPRz
> -----END PGP SIGNATURE-----
> 



- -- 
NP-Hardass
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWbuXcAAoJEBzZQR2yrxj7hA4QALKXniqx4Va0YnBJizZn36D9
MJZbj9qsldrO/9/n4Vnrxnbk1cAAXl9XQJgjDI8b/CYVoS5H7BAW8ZnFlbrgfAYd
0a+IWeHixhpuHwqiRoxv9nS8wB3pUh/hV7ICzzIIdy7GznwmluoIm0AonAhlmXGR
qq5M6HmcJmz/bWKrI6GbaxCU1FaNdH0rhgTwEmwqZizTzEpbPtvCa7hezC5rQayQ
GJYnd6xRUTekx06/s9h7JGxDnbUkZ/IwSgUNS8mtoO6tl8QMsgHOK4QZwtQG/pdQ
h8QAOtl9HWkvRS6kr1ex5FfMi/M0V/iQuy5+lWiUuMQqi/UwLljDbtr9m1O9uxur
gcRK71WauUbRCwltUf2m3f8U90FqlvfcQ9ngex5FkP09iSD66XHpaRL4zByZuk5r
RvC1dFwo3X+TsolKpzlztYvKnCd5ap2Enb5jf5W83pEgxUtd6hRcAjK80vpn+ODq
YGlIMX3cvmW3MRmcoKbTeCqn3XN8OXLNZaEXWxyTU/b5lRXnzpUwxr6It0GK+bY3
yzPWV2TKtS3KHgsgFoC3IYtRfQpCs4pBVoKMGpKFLhDqss+1gpm3UQkeKwAlFcec
L0Fv3UpRc7De2FhX0qXPIuzINoHT6I8DPW32VAChH/Lk6jLju+//y7pX3Nv4mtof
dh5wtaiF7/PnOxVwxZ95
=ahBl
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH] Add .git dir to excluded dirs in default PORTAGE_RSYNC_OPTS

[Brian Dolbec]

On Mon, 14 Dec 2015 10:52:50 -0500
NP-Hardass <NP-Hardass@gentoo.org> wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
> 
> My apologies for the ambiguity.  I didn't realize there was a bug on
> bugzilla regarding the original incident.
> https://bugs.gentoo.org/show_bug.cgi?id=567074
> The .git directory was pushed out over rsync, portage refused to sync
> via rsync once it had a .git dir, and so rsync was broken for users
> for a period of time.  So this is effectively a user-side
> remeditation to reinforce the already taken server-side remediation.
> 
> On Mon, 14 Dec 2015 14:15:08 +0100
> Alexander Berntsen <bernalex@gentoo.org> wrote:
> 
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA512
> > 
> > On 14/12/15 04:08, NP-Hardass wrote:  
> > > like those that we recently experienced.    
> > I don't know what this is in reference too, so it should be
> > explained better.
> > 
> > I have no real objects on the patch, but defer the ACK to Brian.
> > Could you have a look, please?
> > - -- 
> > Alexander
> > bernalex@gentoo.org
> > https://secure.plaimi.net/~alexander
> 

Yeah, this is fine, it was handled user side, but it is good to make
this default.  I'll merge it in a bit.

-- 
Brian Dolbec <dolsen>

Re: [gentoo-portage-dev] [PATCH] Add .git dir to excluded dirs in default PORTAGE_RSYNC_OPTS

[Brian Dolbec]

On Mon, 14 Dec 2015 08:54:27 -0800
Brian Dolbec <dolsen@gentoo.org> wrote:

> On Mon, 14 Dec 2015 10:52:50 -0500
> NP-Hardass <NP-Hardass@gentoo.org> wrote:
> 
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA256
> > 
> > My apologies for the ambiguity.  I didn't realize there was a bug on
> > bugzilla regarding the original incident.
> > https://bugs.gentoo.org/show_bug.cgi?id=567074
> > The .git directory was pushed out over rsync, portage refused to
> > sync via rsync once it had a .git dir, and so rsync was broken for
> > users for a period of time.  So this is effectively a user-side
> > remeditation to reinforce the already taken server-side remediation.
> > 
> > On Mon, 14 Dec 2015 14:15:08 +0100
> > Alexander Berntsen <bernalex@gentoo.org> wrote:
> >   
> > > -----BEGIN PGP SIGNED MESSAGE-----
> > > Hash: SHA512
> > > 
> > > On 14/12/15 04:08, NP-Hardass wrote:    
> > > > like those that we recently experienced.      
> > > I don't know what this is in reference too, so it should be
> > > explained better.
> > > 
> > > I have no real objects on the patch, but defer the ACK to Brian.
> > > Could you have a look, please?
> > > - -- 
> > > Alexander
> > > bernalex@gentoo.org
> > > https://secure.plaimi.net/~alexander  
> >   
> 
> Yeah, this is fine, it was handled user side, but it is good to make
> this default.  I'll merge it in a bit.
> 

Applied pand pushed to master.

NP-Hardass and @all.  Please don't clearsign patches.  It was a bitch
to manually edit the mbox file to remove the signature cruft preventing
git from applying it correctly.  I imagine a detached sig would be fine
(untested).

-- 
Brian Dolbec <dolsen>