From c6dad2634dae50a15d97babc4411e0d8bdd0765e Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 9 Mar 2010 11:26:48 +0000 Subject: [PATCH] Merged from trunk -r15760:15770 | 15765 | Bug #307409 - Force --verbose mode when displaying circular | | zmedico | deps. | | 15767 | Exclude PORTAGE_SYNC_STALE from the ebuild environment. | | zmedico | | | 15769 | Disable PORTAGE_SYNC_STALE warnings when --usepkgonly is | | zmedico | enabled. | svn path=/main/branches/prefix/; revision=15797 --- pym/_emerge/actions.py | 3 ++- pym/_emerge/depgraph.py | 2 +- pym/portage/package/ebuild/config.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 69aeb3085..372c5017f 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -65,7 +65,8 @@ if sys.hexversion >= 0x3000000: def action_build(settings, trees, mtimedb, myopts, myaction, myfiles, spinner): - old_tree_timestamp_warn(settings['PORTDIR'], settings) + if '--usepkgonly' not in myopts: + old_tree_timestamp_warn(settings['PORTDIR'], settings) # validate the state of the resume data # so that we can make assumptions later. diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index f0f60464b..7d3504167 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3904,7 +3904,7 @@ class depgraph(object): tempgraph.remove(node) display_order.reverse() self._frozen_config.myopts.pop("--quiet", None) - self._frozen_config.myopts.pop("--verbose", None) + self._frozen_config.myopts["--verbose"] = True self._frozen_config.myopts["--tree"] = True portage.writemsg("\n\n", noiselevel=-1) self.display(display_order) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index c39c05614..d9686f1ec 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -282,7 +282,8 @@ class config(object): "PORTAGE_REPO_DUPLICATE_WARN", "PORTAGE_RO_DISTDIRS", "PORTAGE_RSYNC_EXTRA_OPTS", "PORTAGE_RSYNC_OPTS", - "PORTAGE_RSYNC_RETRIES", "PORTAGE_USE", "PORT_LOGDIR", + "PORTAGE_RSYNC_RETRIES", "PORTAGE_SYNC_STALE", + "PORTAGE_USE", "PORT_LOGDIR", "QUICKPKG_DEFAULT_OPTS", "RESUMECOMMAND", "RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTP", "RESUMECOMMAND_SFTP", "SYNC", "USE_EXPAND_HIDDEN", "USE_ORDER", -- 2.26.2