diff options
| author | Zac Medico <zmedico@gentoo.org> | 2013-01-15 12:52:23 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-01-15 12:52:23 -0800 |
| commit | 007c92003a6ef9eb6d70b06ca463805a0f4cf32f (patch) | |
| tree | e75144cbf8ff6f8516de457aa2a6dd13316747d3 | |
| parent | e9dc2b6753aa29eb776f15532fdda18f10af5d44 (diff) | |
| download | portage-007c92003a6ef9eb6d70b06ca463805a0f4cf32f.tar.gz portage-007c92003a6ef9eb6d70b06ca463805a0f4cf32f.tar.bz2 portage-007c92003a6ef9eb6d70b06ca463805a0f4cf32f.zip | |
doebuild: tweak handling of _unused param
| -rwxr-xr-x | bin/ebuild | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/ebuild b/bin/ebuild index 754b9a9bd..44b3c99d0 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -331,7 +331,7 @@ for arg in pargs: if arg in ("digest", "manifest") and force: discard_digests(ebuild, tmpsettings, portage.portdb) - a = portage.doebuild(ebuild, arg, portage.root, tmpsettings, + a = portage.doebuild(ebuild, arg, settings=tmpsettings, debug=debug, tree=mytree, vartree=portage.db[portage.root]['vartree']) except KeyboardInterrupt: diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index a214c39a8..bef19892c 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -454,7 +454,7 @@ _doebuild_commands_without_builddir = ( 'fetch', 'fetchall', 'help', 'manifest' ) -def doebuild(myebuild, mydo, _unused=None, settings=None, debug=0, listonly=0, +def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0, listonly=0, fetchonly=0, cleanup=0, dbkey=DeprecationWarning, use_cache=1, fetchall=0, tree=None, mydbapi=None, vartree=None, prev_mtimes=None, fd_pipes=None, returnpid=False): @@ -518,10 +518,10 @@ def doebuild(myebuild, mydo, _unused=None, settings=None, debug=0, listonly=0, mysettings = settings myroot = settings['EROOT'] - if _unused is not None and _unused != mysettings['EROOT']: + if _unused is not DeprecationWarning: warnings.warn("The third parameter of the " - "portage.doebuild() is now unused. Use " - "settings['ROOT'] instead.", + "portage.doebuild() is deprecated. Instead " + "settings['EROOT'] is used.", DeprecationWarning, stacklevel=2) if dbkey is not DeprecationWarning: |