summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-01-30 14:46:50 +0000
committerZac Medico <zmedico@gentoo.org>2010-01-30 14:46:50 +0000
commit35e9b0eb9c364822e1c2947ca0783773943cfaba (patch)
tree48e6024b93e8ed78d28fe76545f09f8708d32536
parenta4e18a443266fc0e4f8a4ec6ad5154eb82ed5b4b (diff)
downloadportage-35e9b0eb9c364822e1c2947ca0783773943cfaba.tar.gz
portage-35e9b0eb9c364822e1c2947ca0783773943cfaba.tar.bz2
portage-35e9b0eb9c364822e1c2947ca0783773943cfaba.zip
Don't generate DeprecationWarning for portdbapi arguments. Wait until new
portdbapi constructor is in stable portage first. svn path=/main/trunk/; revision=15290
-rw-r--r--pym/portage/dbapi/porttree.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 1b5567a8e..452674bb8 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -143,7 +143,7 @@ class portdbapi(dbapi):
def __init__(self, _unused_param=None, mysettings=None):
"""
- @param _unused_param: deprecated
+ @param _unused_param: deprecated, use mysettings['PORTDIR'] instead
@type _unused_param: None
@param mysettings: an immutable config instance
@type mysettings: portage.config
@@ -157,7 +157,8 @@ class portdbapi(dbapi):
from portage import settings
self.mysettings = config(clone=settings)
- if _unused_param is not None:
+ # enable this warning after this parameter is unused in stable portage
+ if False and _unused_param is not None:
warnings.warn("The first parameter of the " + \
"portage.dbapi.porttree.portdbapi" + \
" constructor is now unused. Use " + \