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

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

[Zac Medico]

commit:     ec113fa7a8b9e8f13c4b4dfd110b10fe9a0c7cfc
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 02:20:16 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 02:20:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ec113fa7

Display: tweak output and docs for bug 58416

Now the masking display is disabled by the --quiet option if the
--verbose  option is not enabled simultaneously. Also, docs are
updated as per bug 58416, comment #11 and #12.

---
 man/emerge.1                   |   13 +++++++++----
 pym/_emerge/resolver/output.py |    7 +++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 05498ff..311ce75 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -721,11 +721,12 @@ displayed.
 .B [ebuild     U *] sys\-apps/portage\-2.2.0_alpha6 [2.1.9.25]
 Portage 2.1.9.25 is installed, but if you run the command, then
 portage will upgrade to version 2.2.0_alpha6. In this case,
-\fB\-\-verbose\fR causes the \fB*\fR symbol to be displayed, in
-order to indicate that version 2.2.0_alpha6 is masked by missing
-keyword. The following symbols are used to indicate various types
+the \fB*\fR symbol is displayed, in order to indicate that version
+2.2.0_alpha6 is masked by missing keyword. This type of masking
+display is disabled by the \fB\-\-quiet\fR option if the
+\fB\-\-verbose\fR option is not enabled simultaneously.
+The following symbols are used to indicate various types
 of masking:
-
 .TS
 l l
 __
@@ -736,6 +737,10 @@ Symbol	Mask Type
 *	missing keyword
 ~	unstable keyword
 .TE
+
+\fBNOTE:\fR The unstable keyword symbol (~) will not be shown in cases
+in which the corresponding unstable keywords have been accepted
+globally via \fBACCEPT_KEYWORDS\fR.
 .TP
 
 

diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index 93a2b5d..0e7585d 100644
--- a/pym/_emerge/resolver/output.py
+++ b/pym/_emerge/resolver/output.py
@@ -158,6 +158,9 @@ class Display(object):
 			self.pkgsettings["USE_EXPAND_HIDDEN"].lower().split()
 		return
 
+	def include_mask_str(self):
+		return self.conf.verbosity > 1
+
 	def gen_mask_str(self, pkg):
 		"""
 		@param pkg: _emerge.Package instance
@@ -181,7 +184,7 @@ class Display(object):
 
 	def empty_space_in_brackets(self):
 		space = ""
-		if self.conf.verbosity == 3:
+		if self.include_mask_str():
 			# add column for mask status
 			space += " "
 		return space
@@ -815,7 +818,7 @@ class Display(object):
 					self.check_system_world(pkg)
 				addl = self.set_interactive(pkg, pkg_info.ordered, addl)
 
-				if self.conf.verbosity == 3:
+				if self.include_mask_str():
 					addl += self.gen_mask_str(pkg)
 
 				if pkg.root != "/":

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

[Zac Medico]

commit:     db2e6f614169307e1c9cca9f8bab63f724547db4
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 01:37:19 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 01:37:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=db2e6f61

merge list: distinguish reinstall with red "r"

This is for reinstall due to slot or sub-slot change of a dependency
when the := slot operator is used.

---
 man/emerge.1                           |    3 ++-
 pym/_emerge/resolver/output.py         |    7 +++++++
 pym/_emerge/resolver/output_helpers.py |    8 ++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 65eefa2..8474cf9 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -619,7 +619,8 @@ N	new (not yet installed)
 S	new SLOT installation (side-by-side versions) 
 U	updating (to another version)
 D	downgrading (best version seems lower)
-R	replacing (remerging same version))
+r	reinstall (forced due to slot or sub\-slot change of a dependency)
+R	replacing (remerging same version)
 F	fetch restricted (must be manually downloaded)
 f	fetch restricted (already downloaded)
 I	interactive (requires user input)

diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index 11e668b..3325a42 100644
--- a/pym/_emerge/resolver/output.py
+++ b/pym/_emerge/resolver/output.py
@@ -790,6 +790,13 @@ class Display(object):
 				pkg_info = self.set_pkg_info(pkg, ordered)
 				pkg_info.oldbest_list, myinslotlist = \
 					self._get_installed_best(pkg, pkg_info)
+				if ordered and pkg_info.merge and \
+					not pkg_info.attr_display.new:
+					for arg, atom in depgraph._iter_atoms_for_pkg(pkg):
+						if arg.force_reinstall:
+							pkg_info.attr_display.force_reinstall = True
+							break
+
 				self.verboseadd = ""
 				if self.quiet_repo_display:
 					self.repoadd = None

diff --git a/pym/_emerge/resolver/output_helpers.py b/pym/_emerge/resolver/output_helpers.py
index 41dc324..be4ea4a 100644
--- a/pym/_emerge/resolver/output_helpers.py
+++ b/pym/_emerge/resolver/output_helpers.py
@@ -641,6 +641,7 @@ class PkgInfo(object):
 class PkgAttrDisplay(SlotObject):
 
 	__slots__ = ("downgrade", "fetch_restrict", "fetch_restrict_satisfied",
+		"force_reinstall",
 		"interactive", "mask", "new", "new_slot", "new_version", "replace")
 
 	def __str__(self):
@@ -651,8 +652,11 @@ class PkgAttrDisplay(SlotObject):
 		else:
 			output.append(" ")
 
-		if self.new:
-			output.append(green("N"))
+		if self.new or self.force_reinstall:
+			if self.force_reinstall:
+				output.append(red("r"))
+			else:
+				output.append(green("N"))
 		else:
 			output.append(" ")