commit:     75f86cc121deed1df25c2cbafe22483828397c67
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 22 12:30:19 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Dec  4 19:56:35 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=75f86cc1

SyncRepos: parse EMERGE_DEFAULT_OPTS

We need to parse EMERGE_DEFAULT_OPTS, for settings like
--package-moves=n.

---
 pym/portage/emaint/modules/sync/sync.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pym/portage/emaint/modules/sync/sync.py 
b/pym/portage/emaint/modules/sync/sync.py
index 845e8c7..1dade6f 100644
--- a/pym/portage/emaint/modules/sync/sync.py
+++ b/pym/portage/emaint/modules/sync/sync.py
@@ -58,6 +58,13 @@ class SyncRepos(object):
                        emerge_config = load_emerge_config(
                                action='sync', args=_files, opts=opts)
 
+                       # Parse EMERGE_DEFAULT_OPTS, for settings like
+                       # --package-moves=n.
+                       cmdline = portage.util.shlex_split(
+                               emerge_config.target_config.settings.get(
+                               "EMERGE_DEFAULT_OPTS", ""))
+                       emerge_config.opts = parse_opts(cmdline, silent=True)[1]
+
                        if hasattr(portage, 'settings'):
                                # cleanly destroy global objects
                                portage._reset_legacy_globals()

Reply via email to