1 |
On Mon, 3 Nov 2014 13:19:06 -0800 |
2 |
Zac Medico <zmedico@g.o> wrote: |
3 |
|
4 |
> In install.py and movefile.py there were some redundant default |
5 |
> PORTAGE_XATTR_EXCLUDE settings. The default settings in make.globals |
6 |
> should be sufficient. Therefore, remove the redundant settings so that |
7 |
> we don't have to maintain them. |
8 |
> |
9 |
> Fixes: 2fcdb5f36fac ("Add btrfs.* to default PORTAGE_XATTR_EXCLUDE |
10 |
> (527636)") X-Gentoo-Bug: 527636 |
11 |
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=527636 |
12 |
> Acked-by: Brian Dolbec <dolsen@g.o> |
13 |
> Acked-by: Anthony G. Basile <blueness@g.o> |
14 |
> --- |
15 |
> bin/install.py | 2 +- |
16 |
> pym/portage/util/movefile.py | 2 +- |
17 |
> 2 files changed, 2 insertions(+), 2 deletions(-) |
18 |
> |
19 |
> diff --git a/bin/install.py b/bin/install.py |
20 |
> index 3c5e0de..5bbe97b 100755 |
21 |
> --- a/bin/install.py |
22 |
> +++ b/bin/install.py |
23 |
> @@ -171,7 +171,7 @@ def copy_xattrs(opts, files): |
24 |
> source, target = files, opts.target_directory |
25 |
> target_is_directory = True |
26 |
> |
27 |
> - exclude = os.environ.get("PORTAGE_XATTR_EXCLUDE", |
28 |
> "security.* system.nfs4_acl") |
29 |
> + exclude = os.environ.get("PORTAGE_XATTR_EXCLUDE", "") |
30 |
> |
31 |
> try: |
32 |
> if target_is_directory: |
33 |
> diff --git a/pym/portage/util/movefile.py |
34 |
> b/pym/portage/util/movefile.py index 452e77f..d00f624 100644 |
35 |
> --- a/pym/portage/util/movefile.py |
36 |
> +++ b/pym/portage/util/movefile.py |
37 |
> @@ -328,7 +328,7 @@ def movefile(src, dest, newmtime=None, |
38 |
> sstat=None, mysettings=None, if xattr_enabled: |
39 |
> try: |
40 |
> _copyxattr(src_bytes, |
41 |
> dest_tmp_bytes, |
42 |
> - |
43 |
> exclude=mysettings.get("PORTAGE_XATTR_EXCLUDE", "security.* |
44 |
> system.nfs4_acl")) |
45 |
> + |
46 |
> exclude=mysettings.get("PORTAGE_XATTR_EXCLUDE", "")) except |
47 |
> SystemExit: raise |
48 |
> except: |
49 |
|
50 |
Bah! just 2 lines changed... merge it already ;) |
51 |
|
52 |
|
53 |
-- |
54 |
Brian Dolbec <dolsen> |