[gentoo-commits] proj/portage:master commit in: cnf/, pym/_emerge/

[gentoo-commits] proj/portage:master commit in: cnf/, pym/_emerge/

[Zac Medico]

commit:     ecf347fe2bde0f285b04070a13a170accdf73838
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 11:26:13 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 11:26:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ecf347fe

Add --human-readable to rsync opts for bug 269410

---
 cnf/make.globals       |    2 +-
 pym/_emerge/actions.py |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index fade448..0f6f541 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -95,7 +95,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 --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
+PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
 
 # The number of days after the last `emerge --sync` that a warning
 # message should be produced.

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 1725053..31d53f9 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2024,6 +2024,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 				"--whole-file",   # Don't do block transfers, only entire files
 				"--delete",       # Delete files that aren't in the master tree
 				"--stats",        # Show final statistics about what was transfered
+				"--human-readable",
 				"--timeout="+str(mytimeout), # IO timeout if not done in X seconds
 				"--exclude=/distfiles",   # Exclude distfiles from consideration
 				"--exclude=/local",       # Exclude local     from consideration

[gentoo-commits] proj/portage:master commit in: cnf/, pym/_emerge/

[Zac Medico]

commit:     367bbdfdab866c00c0d826732d4672ed3863fa09
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 19:25:37 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 19:25:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=367bbdfd

PORTAGE_RSYNC_OPTS: --omit-dir-times

Directory modification times are irrelevant, and preserving them can be
annoying when using squashfs + unionfs, since it can trigger creation
many empty directories in the RW branch.

---
 cnf/make.globals       | 2 +-
 pym/_emerge/actions.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 3c3ddc5..e291b82 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 --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"
 
 # The number of days after the last `emerge --sync` that a warning
 # message should be produced.

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 0fecc8f..8c314b3 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2169,6 +2169,7 @@ def _sync_repo(emerge_config, repo):
 				"--safe-links",   # Ignore links outside of tree
 				"--perms",        # Preserve permissions
 				"--times",        # Preserive mod times
+				"--omit-dir-times",
 				"--compress",     # Compress the data transmitted
 				"--force",        # Force deletion on non-empty dirs
 				"--whole-file",   # Don't do block transfers, only entire files

[gentoo-commits] proj/portage:master commit in: cnf/, pym/_emerge/

[Zac Medico]

commit:     8018584e78fa8b2714122eb2fda8488c94e7cc77
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun May  3 19:18:16 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon May  4 06:26:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8018584e

PORTAGE_XATTR_EXCLUDE: preserve security.capability (bug 548516)

Also, fix BinpkgExtractorAsync tar options to preserve
security.capability attributes.

X-Gentoo-Bug: 548516
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=548516
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>

 cnf/make.globals                    | 6 ++++--
 pym/_emerge/BinpkgExtractorAsync.py | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index dd99618..82d8cc1 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -123,9 +123,11 @@ PORTAGE_ELOG_MAILFROM="portage@localhost"
 PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --digest-algo SHA256 --clearsign --yes --default-key \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\""
 
 # btrfs.* attributes are irrelevant, see bug #527636.
-# Security labels are special, see bug #461868.
+# security.* attributes may be special (see bug 461868), but
+# security.capability is specifically not excluded (bug 548516).
 # system.nfs4_acl attributes are irrelevant, see bug #475496.
-PORTAGE_XATTR_EXCLUDE="btrfs.* security.* system.nfs4_acl"
+PORTAGE_XATTR_EXCLUDE="btrfs.* security.evm security.ima
+	security.selinux system.nfs4_acl"
 
 #            *****************************
 #            **  DO NOT EDIT THIS FILE  **

diff --git a/pym/_emerge/BinpkgExtractorAsync.py b/pym/_emerge/BinpkgExtractorAsync.py
index 6aaa448..0bf3c74 100644
--- a/pym/_emerge/BinpkgExtractorAsync.py
+++ b/pym/_emerge/BinpkgExtractorAsync.py
@@ -23,7 +23,10 @@ class BinpkgExtractorAsync(SpawnProcess):
 			process = subprocess.Popen(["tar", "--help"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 			output = process.communicate()[0]
 			if b"--xattrs" in output:
-				tar_options = "--xattrs"
+				tar_options = ["--xattrs", "--xattrs-include='*'"]
+				for x in portage.util.shlex_split(self.env.get("PORTAGE_XATTR_EXCLUDE", "")):
+					tar_options.append(portage._shell_quote("--xattrs-exclude=%s" % x))
+				tar_options = " ".join(tar_options)
 
 		decomp_cmd = _decompressors.get(
 			compression_probe(self.pkg_path))