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 563A5138E74 for ; Mon, 3 Nov 2014 21:19:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 305D9E083A; Mon, 3 Nov 2014 21:19:25 +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 A644FE0839 for ; Mon, 3 Nov 2014 21:19:24 +0000 (UTC) Received: from localhost.localdomain (ip70-181-96-121.oc.oc.cox.net [70.181.96.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id 4EF7B3404C9; Mon, 3 Nov 2014 21:19:22 +0000 (UTC) From: Zac Medico To: gentoo-portage-dev@lists.gentoo.org Cc: Zac Medico Subject: [gentoo-portage-dev] [PATCH] Remove redundant PORTAGE_XATTR_EXCLUDE defaults (527636) Date: Mon, 3 Nov 2014 13:19:06 -0800 Message-Id: <1415049546-8846-1-git-send-email-zmedico@gentoo.org> X-Mailer: git-send-email 2.0.4 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 X-Archives-Salt: f81cc137-9e49-4703-9b4e-66a4061acaa8 X-Archives-Hash: 0943baee68a3e997b4a9a8b579945736 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: -- 2.0.4