doebuild: tweak handling of _unused param

diff --git a/bin/ebuild b/bin/ebuild
index 754b9a9bd8ea704bd2fd55ee4086defc1e9e18e3..44b3c99d0731937dd19b44b1392d8428bcb12364 100755 (executable)
--- 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 a214c39a8ec38a13738c78b92eea61a1ee050290..bef19892c61f33500e1f2d66d2d9e97cd64a9c83 100644 (file)
--- 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: