Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15374 - main/trunk/pym/portage/dbapi
Date: Fri, 19 Feb 2010 09:09:43
Message-Id: E1NiOrj-0005d0-6J@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-02-19 09:09:38 +0000 (Fri, 19 Feb 2010)
3 New Revision: 15374
4
5 Modified:
6 main/trunk/pym/portage/dbapi/bintree.py
7 Log:
8 Deprecate the unused getbinpkgsonly parameter to binarytree.populate().
9
10
11 Modified: main/trunk/pym/portage/dbapi/bintree.py
12 ===================================================================
13 --- main/trunk/pym/portage/dbapi/bintree.py 2010-02-18 21:52:18 UTC (rev 15373)
14 +++ main/trunk/pym/portage/dbapi/bintree.py 2010-02-19 09:09:38 UTC (rev 15374)
15 @@ -32,6 +32,7 @@
16 import re
17 import stat
18 import sys
19 +import warnings
20 from itertools import chain
21
22 if sys.hexversion >= 0x3000000:
23 @@ -443,8 +444,15 @@
24 _movefile(src_path, dest_path, mysettings=self.settings)
25 self._pkg_paths[cpv] = mypath
26
27 - def populate(self, getbinpkgs=0, getbinpkgsonly=0):
28 + def populate(self, getbinpkgs=0, getbinpkgsonly=None):
29 "populates the binarytree"
30 +
31 + if getbinpkgsonly is not None:
32 + warnings.warn(
33 + "portage.dbapi.bintree.binarytree.populate(): " + \
34 + "getbinpkgsonly parameter is deprecated",
35 + DeprecationWarning)
36 +
37 if self._populating:
38 return
39 from portage.locks import lockfile, unlockfile
40 @@ -454,13 +462,13 @@
41 pkgindex_lock = lockfile(self._pkgindex_file,
42 wantnewlockfile=1)
43 self._populating = True
44 - self._populate(getbinpkgs, getbinpkgsonly)
45 + self._populate(getbinpkgs)
46 finally:
47 if pkgindex_lock:
48 unlockfile(pkgindex_lock)
49 self._populating = False
50
51 - def _populate(self, getbinpkgs=0, getbinpkgsonly=0):
52 + def _populate(self, getbinpkgs=0):
53 if (not os.path.isdir(self.pkgdir) and not getbinpkgs):
54 return 0