Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15529 - main/branches/2.1.7/pym/portage/dbapi
Date: Tue, 02 Mar 2010 19:49:37
Message-Id: E1NmY63-0006EQ-Ht@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-03-02 19:49:35 +0000 (Tue, 02 Mar 2010)
3 New Revision: 15529
4
5 Modified:
6 main/branches/2.1.7/pym/portage/dbapi/porttree.py
7 Log:
8 Don't generate DeprecationWarning for portdbapi arguments. Wait until new
9 portdbapi constructor is in stable portage first. (trunk r15290)
10
11 Modified: main/branches/2.1.7/pym/portage/dbapi/porttree.py
12 ===================================================================
13 --- main/branches/2.1.7/pym/portage/dbapi/porttree.py 2010-03-02 19:49:24 UTC (rev 15528)
14 +++ main/branches/2.1.7/pym/portage/dbapi/porttree.py 2010-03-02 19:49:35 UTC (rev 15529)
15 @@ -143,7 +143,7 @@
16
17 def __init__(self, _unused_param=None, mysettings=None):
18 """
19 - @param _unused_param: deprecated
20 + @param _unused_param: deprecated, use mysettings['PORTDIR'] instead
21 @type _unused_param: None
22 @param mysettings: an immutable config instance
23 @type mysettings: portage.config
24 @@ -157,7 +157,8 @@
25 from portage import settings
26 self.mysettings = config(clone=settings)
27
28 - if _unused_param is not None:
29 + # enable this warning after this parameter is unused in stable portage
30 + if False and _unused_param is not None:
31 warnings.warn("The first parameter of the " + \
32 "portage.dbapi.porttree.portdbapi" + \
33 " constructor is now unused. Use " + \