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

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 69aeb308591a354354a0b1fe69f5de85a3f5554f..372c5017fc38da48f9f1cbf8b44e147619f47794 100644 (file)
--- 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 f0f60464b1506237c8c8b94aa295b72a1bdff023..7d3504167ce0086746b492c4cf15719eb59b1e78 100644 (file)
--- 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 c39c05614516e113cba5b9fb8416f92a1a051a47..d9686f1ecd2c4c64311df6e3affed344751fbe33 100644 (file)
--- 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",