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 CEF531389E2 for ; Thu, 4 Dec 2014 20:16:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED8D2E093A; Thu, 4 Dec 2014 20:16:17 +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 ABDD2E0919 for ; Thu, 4 Dec 2014 20:16:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 008C13405CA for ; Thu, 4 Dec 2014 20:16:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F109B94D for ; Thu, 4 Dec 2014 20:16:11 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1417722995.75f86cc121deed1df25c2cbafe22483828397c67.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/emaint/modules/sync/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/emaint/modules/sync/sync.py X-VCS-Directories: pym/portage/emaint/modules/sync/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 75f86cc121deed1df25c2cbafe22483828397c67 X-VCS-Branch: master Date: Thu, 4 Dec 2014 20:16:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 21f0d1e8-96d0-497d-a9fd-5f529a9b08b2 X-Archives-Hash: 65c29d70c573a32f44ae70417cfa2c5e Message-ID: <20141204201611.KpAUHn5dfHPI0d17FEMxKR1DQCl2iH6gIPoNT-HClVk@z> commit: 75f86cc121deed1df25c2cbafe22483828397c67 Author: Zac Medico gentoo org> AuthorDate: Wed Oct 22 12:30:19 2014 +0000 Commit: Brian Dolbec gmail 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()