diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-02 19:49:50 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-02 19:49:50 +0000 |
| commit | eb40f81011715443210214596d5063fa9b677c50 (patch) | |
| tree | 7b9edaa62f906927d9c85558fe6ea30f205d545a | |
| parent | 355127c33e618de29daabaccd4545570f748577f (diff) | |
| download | portage-eb40f81011715443210214596d5063fa9b677c50.tar.gz portage-eb40f81011715443210214596d5063fa9b677c50.tar.bz2 portage-eb40f81011715443210214596d5063fa9b677c50.zip | |
Show a DeprecationWarning if the deprecated pordbapi constructor parameter
is used incorrectly. (trunk r15292)
svn path=/main/branches/2.1.7/; revision=15531
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index 452674bb8..d5ecce987 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -157,16 +157,17 @@ class portdbapi(dbapi): from portage import settings self.mysettings = config(clone=settings) - # enable this warning after this parameter is unused in stable portage - if False and _unused_param is not None: + porttree_root = self.mysettings['PORTDIR'] + + # always show this warning after this parameter + # is unused in stable portage + if _unused_param is not None and _unused_param != porttree_root: warnings.warn("The first parameter of the " + \ "portage.dbapi.porttree.portdbapi" + \ " constructor is now unused. Use " + \ "mysettings['PORTDIR'] instead.", DeprecationWarning) - porttree_root = self.mysettings['PORTDIR'] - # This is strictly for use in aux_get() doebuild calls when metadata # is generated by the depend phase. It's safest to use a clone for # this purpose because doebuild makes many changes to the config |