From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E3FAD138E74 for ; Mon, 3 Nov 2014 23:18:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E31B3E085E; Mon, 3 Nov 2014 23:18:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E341E0835 for ; Mon, 3 Nov 2014 23:18:53 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010634bdfa9ecf80.vc.shawcable.net [96.49.31.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 1D3B2340022 for ; Mon, 3 Nov 2014 23:18:52 +0000 (UTC) Date: Mon, 3 Nov 2014 15:18:00 -0800 From: Brian Dolbec To: gentoo-portage-dev@lists.gentoo.org Subject: Re: [gentoo-portage-dev] [PATCH] Remove redundant PORTAGE_XATTR_EXCLUDE defaults (527636) Message-ID: <20141103151800.2d240553.dolsen@gentoo.org> In-Reply-To: <1415049546-8846-1-git-send-email-zmedico@gentoo.org> References: <1415049546-8846-1-git-send-email-zmedico@gentoo.org> Organization: Gentoo Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: f58fe0ff-6b33-429f-ad00-d78d87d64472 X-Archives-Hash: 696434ece54bebb38b3f26076a4f94ba On Mon, 3 Nov 2014 13:19:06 -0800 Zac Medico wrote: > In install.py and movefile.py there were some redundant default > PORTAGE_XATTR_EXCLUDE settings. The default settings in make.globals > should be sufficient. Therefore, remove the redundant settings so that > we don't have to maintain them. > > Fixes: 2fcdb5f36fac ("Add btrfs.* to default PORTAGE_XATTR_EXCLUDE > (527636)") X-Gentoo-Bug: 527636 > X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=527636 > Acked-by: Brian Dolbec > Acked-by: Anthony G. Basile > --- > bin/install.py | 2 +- > pym/portage/util/movefile.py | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/bin/install.py b/bin/install.py > index 3c5e0de..5bbe97b 100755 > --- a/bin/install.py > +++ b/bin/install.py > @@ -171,7 +171,7 @@ def copy_xattrs(opts, files): > source, target = files, opts.target_directory > target_is_directory = True > > - exclude = os.environ.get("PORTAGE_XATTR_EXCLUDE", > "security.* system.nfs4_acl") > + exclude = os.environ.get("PORTAGE_XATTR_EXCLUDE", "") > > try: > if target_is_directory: > diff --git a/pym/portage/util/movefile.py > b/pym/portage/util/movefile.py index 452e77f..d00f624 100644 > --- a/pym/portage/util/movefile.py > +++ b/pym/portage/util/movefile.py > @@ -328,7 +328,7 @@ def movefile(src, dest, newmtime=None, > sstat=None, mysettings=None, if xattr_enabled: > try: > _copyxattr(src_bytes, > dest_tmp_bytes, > - > exclude=mysettings.get("PORTAGE_XATTR_EXCLUDE", "security.* > system.nfs4_acl")) > + > exclude=mysettings.get("PORTAGE_XATTR_EXCLUDE", "")) except > SystemExit: raise > except: Bah! just 2 lines changed... merge it already ;) -- Brian Dolbec