* [gentoo-commits] portage r15797 - in main/branches/prefix/pym: _emerge portage/package/ebuild
@ 2010-03-09 11:26 Fabian Groffen (grobian)
0 siblings, 0 replies; only message in thread
From: Fabian Groffen (grobian) @ 2010-03-09 11:26 UTC (permalink / raw
To: gentoo-commits
Author: grobian
Date: 2010-03-09 11:26:48 +0000 (Tue, 09 Mar 2010)
New Revision: 15797
Modified:
main/branches/prefix/pym/_emerge/actions.py
main/branches/prefix/pym/_emerge/depgraph.py
main/branches/prefix/pym/portage/package/ebuild/config.py
Log:
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. |
Modified: main/branches/prefix/pym/_emerge/actions.py
===================================================================
--- main/branches/prefix/pym/_emerge/actions.py 2010-03-09 11:25:26 UTC (rev 15796)
+++ main/branches/prefix/pym/_emerge/actions.py 2010-03-09 11:26:48 UTC (rev 15797)
@@ -65,7 +65,8 @@
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.
Modified: main/branches/prefix/pym/_emerge/depgraph.py
===================================================================
--- main/branches/prefix/pym/_emerge/depgraph.py 2010-03-09 11:25:26 UTC (rev 15796)
+++ main/branches/prefix/pym/_emerge/depgraph.py 2010-03-09 11:26:48 UTC (rev 15797)
@@ -3904,7 +3904,7 @@
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)
Modified: main/branches/prefix/pym/portage/package/ebuild/config.py
===================================================================
--- main/branches/prefix/pym/portage/package/ebuild/config.py 2010-03-09 11:25:26 UTC (rev 15796)
+++ main/branches/prefix/pym/portage/package/ebuild/config.py 2010-03-09 11:26:48 UTC (rev 15797)
@@ -282,7 +282,8 @@
"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",
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-09 11:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-09 11:26 [gentoo-commits] portage r15797 - in main/branches/prefix/pym: _emerge portage/package/ebuild Fabian Groffen (grobian)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox