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 C8E04138A87 for ; Sat, 21 Feb 2015 19:52:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85BF0E094A; Sat, 21 Feb 2015 19:52:56 +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 35392E094A for ; Sat, 21 Feb 2015 19:52:56 +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 136DB3407E2 for ; Sat, 21 Feb 2015 19:52:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5312612420 for ; Sat, 21 Feb 2015 19:52:53 +0000 (UTC) From: "Pavel Kazakov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pavel Kazakov" Message-ID: <1424547077.2809b7cfcb889bbc76a61fdbce7d58599aa36c56.nullishzero@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/emaint/modules/merges/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/emaint/modules/merges/merges.py X-VCS-Directories: pym/portage/emaint/modules/merges/ X-VCS-Committer: nullishzero X-VCS-Committer-Name: Pavel Kazakov X-VCS-Revision: 2809b7cfcb889bbc76a61fdbce7d58599aa36c56 X-VCS-Branch: master Date: Sat, 21 Feb 2015 19:52:53 +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: f564f9ab-4481-4eda-83a7-ad31ee7d697f X-Archives-Hash: e332753f55dcbcec8904b039f2a63197 commit: 2809b7cfcb889bbc76a61fdbce7d58599aa36c56 Author: Pavel Kazakov gentoo org> AuthorDate: Sat Feb 21 19:31:17 2015 +0000 Commit: Pavel Kazakov gentoo org> CommitDate: Sat Feb 21 19:31:17 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2809b7cf emaint merges: Fix call to emerge Due to a change to the constant PORTAGE_BIN_PATH, the emaint merges module needs to be updated to properly call the emerge command. Furthermore, the --ask flag is set to prompt users before attempting to emerge any packages--thanks to Nikoli for the idea. --- pym/portage/emaint/modules/merges/merges.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/portage/emaint/modules/merges/merges.py b/pym/portage/emaint/modules/merges/merges.py index 7146c76..8f677c2 100644 --- a/pym/portage/emaint/modules/merges/merges.py +++ b/pym/portage/emaint/modules/merges/merges.py @@ -3,8 +3,7 @@ import portage from portage import os, _unicode_encode -from portage.const import MERGING_IDENTIFIER, PORTAGE_BIN_PATH, PRIVATE_PATH, \ - VDB_PATH +from portage.const import MERGING_IDENTIFIER, EPREFIX, PRIVATE_PATH, VDB_PATH from portage.dep import isvalidatom import shutil @@ -206,7 +205,8 @@ class MergesHandler(object): emerge_cmd = ( portage._python_interpreter, '-b', - os.path.join(PORTAGE_BIN_PATH, 'emerge'), + os.path.join(EPREFIX or '/', 'usr', 'bin', 'emerge'), + '--ask', '--quiet', '--oneshot', '--complete-graph=y'