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 EB75113838B for ; Wed, 24 Sep 2014 22:36:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E69A1E0901; Wed, 24 Sep 2014 22:36:38 +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 4DB32E0901 for ; Wed, 24 Sep 2014 22:36:38 +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 038F733F649 for ; Wed, 24 Sep 2014 22:36:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC2D86296 for ; Wed, 24 Sep 2014 22:36:35 +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: <1411598145.3bdaadba9d326374c978c4a521a9db4125279430.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: man/emerge.1 pym/_emerge/depgraph.py X-VCS-Directories: man/ pym/_emerge/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 3bdaadba9d326374c978c4a521a9db4125279430 X-VCS-Branch: master Date: Wed, 24 Sep 2014 22:36:35 +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: 6c0b2762-cd1e-4707-8c5a-064233d539b2 X-Archives-Hash: 737b344610c3ce0bf5adc2062c980a60 commit: 3bdaadba9d326374c978c4a521a9db4125279430 Author: Alexander Berntsen plaimi net> AuthorDate: Mon Sep 22 11:51:21 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Wed Sep 24 22:35:45 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3bdaadba emerge: --autounmask-write if --ask (bug 481578) Signed-off-by: Alexander Berntsen gentoo.org> --- man/emerge.1 | 5 +++-- pym/_emerge/depgraph.py | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index e32bb43..a2cb3f6 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -1,4 +1,4 @@ -.TH "EMERGE" "1" "Mar 2014" "Portage VERSION" "Portage" +.TH "EMERGE" "1" "Sep 2014" "Portage VERSION" "Portage" .SH "NAME" emerge \- Command\-line interface to the Portage system .SH "SYNOPSIS" @@ -367,7 +367,8 @@ to config files, respecting \fBCONFIG_PROTECT\fR and \fB\-\-ask\fR. If the corresponding package.* is a file, the changes are appended to it, if it is a directory, changes are written to the lexicographically last file. This way it is always ensured that the new changes take -precedence over existing changes. +precedence over existing changes. This option is automatically enabled with +\-\-ask. .TP .BR \-\-backtrack=COUNT Specifies an integer number of times to backtrack if diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index f6f716d..5180db5 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -7517,12 +7517,14 @@ class depgraph(object): (using CONFIG_PROTECT). The message includes the comments and the changes. """ - autounmask_write = self._frozen_config.myopts.get("--autounmask-write", "n") == True + ask = "--ask" in self._frozen_config.myopts + autounmask_write = \ + self._frozen_config.myopts.get("--autounmask-write", + ask) is True autounmask_unrestricted_atoms = \ self._frozen_config.myopts.get("--autounmask-unrestricted-atoms", "n") == True quiet = "--quiet" in self._frozen_config.myopts pretend = "--pretend" in self._frozen_config.myopts - ask = "--ask" in self._frozen_config.myopts enter_invalid = '--ask-enter-invalid' in self._frozen_config.myopts def check_if_latest(pkg):