| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-19 09:32:44 +0000 (Fri, 19 Feb 2010) |
| 3 |
New Revision: 15379 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/bintree.py |
| 7 |
Log: |
| 8 |
Use a property to trigger deprecation warnings if binarytree.remotepkgs |
| 9 |
is accessed. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/dbapi/bintree.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/dbapi/bintree.py 2010-02-19 09:21:59 UTC (rev 15378) |
| 15 |
+++ main/trunk/pym/portage/dbapi/bintree.py 2010-02-19 09:32:44 UTC (rev 15379) |
| 16 |
@@ -163,7 +163,7 @@ |
| 17 |
self._remote_has_index = False |
| 18 |
self._remote_base_uri = None |
| 19 |
self._remotepkgs = None # remote metadata indexed by cpv |
| 20 |
- self.remotepkgs = {} # indexed by tbz2 name (deprecated) |
| 21 |
+ self.__remotepkgs = {} # indexed by tbz2 name (deprecated) |
| 22 |
self.invalids = [] |
| 23 |
self.settings = settings |
| 24 |
self._pkg_paths = {} |
| 25 |
@@ -223,6 +223,24 @@ |
| 26 |
chain(*self._pkgindex_translated_keys) |
| 27 |
)) |
| 28 |
|
| 29 |
+ def _get_remotepkgs(self): |
| 30 |
+ warnings.warn("Use binarytree._remotepkgs insead of binarytree.remotepkgs", |
| 31 |
+ DeprecationWarning) |
| 32 |
+ return self.__remotepkgs |
| 33 |
+ |
| 34 |
+ def _set_remotepkgs(self, remotepkgs): |
| 35 |
+ warnings.warn("Use binarytree._remotepkgs insead of binarytree.remotepkgs", |
| 36 |
+ DeprecationWarning) |
| 37 |
+ self.__remotepkgs = remotepkgs |
| 38 |
+ |
| 39 |
+ def _del_remotepkgs(self): |
| 40 |
+ warnings.warn("Use binarytree._remotepkgs insead of binarytree.remotepkgs", |
| 41 |
+ DeprecationWarning) |
| 42 |
+ del self.__remotepkgs |
| 43 |
+ |
| 44 |
+ remotepkgs = property(_get_remotepkgs, _set_remotepkgs, _del_remotepkgs, |
| 45 |
+ "Deprecated self.remotepkgs, only for backward compatibility") |
| 46 |
+ |
| 47 |
def move_ent(self, mylist): |
| 48 |
if not self.populated: |
| 49 |
self.populate() |
| 50 |
@@ -753,7 +771,7 @@ |
| 51 |
self._remotepkgs[d["CPV"]] = d |
| 52 |
self._remote_has_index = True |
| 53 |
self._remote_base_uri = pkgindex.header.get("URI", base_url) |
| 54 |
- self.remotepkgs = {} |
| 55 |
+ self.__remotepkgs = {} |
| 56 |
for cpv in self._remotepkgs: |
| 57 |
self.dbapi.cpv_inject(cpv) |
| 58 |
self.populated = 1 |
| 59 |
@@ -798,18 +816,18 @@ |
| 60 |
writemsg_stdout( |
| 61 |
colorize("GOOD", _("Fetching bininfo from ")) + \ |
| 62 |
re.sub(r'//(.+):.+@(.+)/', r'//\1:*password*@\2/', base_url) + "\n") |
| 63 |
- self.remotepkgs = portage.getbinpkg.dir_get_metadata( |
| 64 |
+ self.__remotepkgs = portage.getbinpkg.dir_get_metadata( |
| 65 |
self.settings["PORTAGE_BINHOST"], chunk_size=chunk_size) |
| 66 |
#writemsg(green(" -- DONE!\n\n")) |
| 67 |
|
| 68 |
- for mypkg in list(self.remotepkgs): |
| 69 |
- if "CATEGORY" not in self.remotepkgs[mypkg]: |
| 70 |
+ for mypkg in list(self.__remotepkgs): |
| 71 |
+ if "CATEGORY" not in self.__remotepkgs[mypkg]: |
| 72 |
#old-style or corrupt package |
| 73 |
writemsg(_("!!! Invalid remote binary package: %s\n") % mypkg, |
| 74 |
noiselevel=-1) |
| 75 |
- del self.remotepkgs[mypkg] |
| 76 |
+ del self.__remotepkgs[mypkg] |
| 77 |
continue |
| 78 |
- mycat = self.remotepkgs[mypkg]["CATEGORY"].strip() |
| 79 |
+ mycat = self.__remotepkgs[mypkg]["CATEGORY"].strip() |
| 80 |
fullpkg = mycat+"/"+mypkg[:-5] |
| 81 |
|
| 82 |
if fullpkg in metadata: |
| 83 |
@@ -832,7 +850,7 @@ |
| 84 |
# invalid tbz2's can hurt things. |
| 85 |
#print "cpv_inject("+str(fullpkg)+")" |
| 86 |
self.dbapi.cpv_inject(fullpkg) |
| 87 |
- remote_metadata = self.remotepkgs[mypkg] |
| 88 |
+ remote_metadata = self.__remotepkgs[mypkg] |
| 89 |
for k, v in remote_metadata.items(): |
| 90 |
remote_metadata[k] = v.strip() |
| 91 |
|
| 92 |
@@ -853,7 +871,7 @@ |
| 93 |
except: |
| 94 |
writemsg(_("!!! Failed to inject remote binary package: %s\n") % fullpkg, |
| 95 |
noiselevel=-1) |
| 96 |
- del self.remotepkgs[mypkg] |
| 97 |
+ del self.__remotepkgs[mypkg] |
| 98 |
continue |
| 99 |
self.populated=1 |
Archives