| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-19 22:09:15 +0000 (Fri, 19 Feb 2010) |
| 3 |
New Revision: 15404 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/porttree.py |
| 7 |
main/trunk/pym/portage/dbapi/vartree.py |
| 8 |
Log: |
| 9 |
Remove deprecated methods that call removed key_expand function. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/dbapi/porttree.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/dbapi/porttree.py 2010-02-19 22:07:57 UTC (rev 15403) |
| 15 |
+++ main/trunk/pym/portage/dbapi/porttree.py 2010-02-19 22:09:15 UTC (rev 15404) |
| 16 |
@@ -25,7 +25,7 @@ |
| 17 |
from portage.manifest import Manifest |
| 18 |
|
| 19 |
from portage import eclass_cache, auxdbkeys, doebuild, flatten, \ |
| 20 |
- listdir, dep_expand, eapi_is_supported, key_expand, dep_check, \ |
| 21 |
+ listdir, dep_expand, eapi_is_supported, dep_check, \ |
| 22 |
_eapi_is_deprecated |
| 23 |
from portage import os |
| 24 |
from portage import _encodings |
| 25 |
@@ -1227,20 +1227,6 @@ |
| 26 |
psplit = pkgsplit(mysplit[1]) |
| 27 |
return "/".join([self.portroot, mysplit[0], psplit[0], mysplit[1]])+".ebuild" |
| 28 |
|
| 29 |
- def resolve_specific(self, myspec): |
| 30 |
- warnings.warn( |
| 31 |
- "portage.dbapi.porttree.portagetree.resolve_specific() is deprecated", |
| 32 |
- DeprecationWarning) |
| 33 |
- cps = catpkgsplit(myspec) |
| 34 |
- if not cps: |
| 35 |
- return None |
| 36 |
- mykey = key_expand(cps[0]+"/"+cps[1], mydb=self.dbapi, |
| 37 |
- settings=self.settings) |
| 38 |
- mykey = mykey + "-" + cps[2] |
| 39 |
- if cps[3] != "r0": |
| 40 |
- mykey = mykey + "-" + cps[3] |
| 41 |
- return mykey |
| 42 |
- |
| 43 |
def depcheck(self, mycheck, use="yes", myusesplit=None): |
| 44 |
return dep_check(mycheck, self.dbapi, use=use, myuse=myusesplit) |
| 45 |
|
| 46 |
|
| 47 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 48 |
=================================================================== |
| 49 |
--- main/trunk/pym/portage/dbapi/vartree.py 2010-02-19 22:07:57 UTC (rev 15403) |
| 50 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2010-02-19 22:09:15 UTC (rev 15404) |
| 51 |
@@ -32,7 +32,7 @@ |
| 52 |
FileNotFound, PermissionDenied, UnsupportedAPIException |
| 53 |
from portage.localization import _ |
| 54 |
|
| 55 |
-from portage import listdir, dep_expand, digraph, flatten, key_expand, \ |
| 56 |
+from portage import listdir, dep_expand, digraph, flatten, \ |
| 57 |
doebuild_environment, doebuild, env_update, prepare_build_dirs, \ |
| 58 |
abssymlink, movefile, _movefile, bsd_chflags, cpv_getkey |
| 59 |
|
| 60 |
@@ -1698,7 +1698,7 @@ |
| 61 |
self.root = root[:] |
| 62 |
if settings is None: |
| 63 |
from portage import settings |
| 64 |
- self.settings = settings # for key_expand calls |
| 65 |
+ self.settings = settings |
| 66 |
if categories is None: |
| 67 |
categories = settings.categories |
| 68 |
self.dbapi = vardbapi(self.root, categories=categories, |
| 69 |
@@ -1783,50 +1783,10 @@ |
| 70 |
masked package for nodes in this nodes list.""" |
| 71 |
return self.dbapi.cp_all() |
| 72 |
|
| 73 |
- def exists_specific_cat(self, cpv, use_cache=1): |
| 74 |
- warnings.warn( |
| 75 |
- "portage.dbapi.vartree.vartree.exists_specific_cat() is deprecated", |
| 76 |
- DeprecationWarning) |
| 77 |
- cpv = key_expand(cpv, mydb=self.dbapi, use_cache=use_cache, |
| 78 |
- settings=self.settings) |
| 79 |
- a = catpkgsplit(cpv) |
| 80 |
- if not a: |
| 81 |
- return 0 |
| 82 |
- mylist = listdir(self.getpath(a[0]), EmptyOnError=1) |
| 83 |
- for x in mylist: |
| 84 |
- b = pkgsplit(x) |
| 85 |
- if not b: |
| 86 |
- self.dbapi.invalidentry(self.getpath(a[0], filename=x)) |
| 87 |
- continue |
| 88 |
- if a[1] == b[0]: |
| 89 |
- return 1 |
| 90 |
- return 0 |
| 91 |
- |
| 92 |
def getebuildpath(self, fullpackage): |
| 93 |
cat, package = catsplit(fullpackage) |
| 94 |
return self.getpath(fullpackage, filename=package+".ebuild") |
| 95 |
|
| 96 |
- def getnode(self, mykey, use_cache=1): |
| 97 |
- warnings.warn( |
| 98 |
- "portage.dbapi.vartree.vartree.getnode() is deprecated", |
| 99 |
- DeprecationWarning) |
| 100 |
- mykey = key_expand(mykey, mydb=self.dbapi, use_cache=use_cache, |
| 101 |
- settings=self.settings) |
| 102 |
- if not mykey: |
| 103 |
- return [] |
| 104 |
- mysplit = catsplit(mykey) |
| 105 |
- mydirlist = listdir(self.getpath(mysplit[0]),EmptyOnError=1) |
| 106 |
- returnme = [] |
| 107 |
- for x in mydirlist: |
| 108 |
- mypsplit = pkgsplit(x) |
| 109 |
- if not mypsplit: |
| 110 |
- self.dbapi.invalidentry(self.getpath(mysplit[0], filename=x)) |
| 111 |
- continue |
| 112 |
- if mypsplit[0] == mysplit[1]: |
| 113 |
- appendme = [mysplit[0]+"/"+x, [mysplit[0], mypsplit[0], mypsplit[1], mypsplit[2]]] |
| 114 |
- returnme.append(appendme) |
| 115 |
- return returnme |
| 116 |
- |
| 117 |
def getslot(self, mycatpkg): |
| 118 |
"Get a slot for a catpkg; assume it exists." |
| 119 |
try: |
| 120 |
@@ -1834,24 +1794,6 @@ |
| 121 |
except KeyError: |
| 122 |
return "" |
| 123 |
|
| 124 |
- def hasnode(self, mykey, use_cache): |
| 125 |
- """Does the particular node (cat/pkg key) exist?""" |
| 126 |
- warnings.warn( |
| 127 |
- "portage.dbapi.vartree.vartree.hadnode() is deprecated", |
| 128 |
- DeprecationWarning) |
| 129 |
- mykey = key_expand(mykey, mydb=self.dbapi, use_cache=use_cache, |
| 130 |
- settings=self.settings) |
| 131 |
- mysplit = catsplit(mykey) |
| 132 |
- mydirlist = listdir(self.getpath(mysplit[0]), EmptyOnError=1) |
| 133 |
- for x in mydirlist: |
| 134 |
- mypsplit = pkgsplit(x) |
| 135 |
- if not mypsplit: |
| 136 |
- self.dbapi.invalidentry(self.getpath(mysplit[0], filename=x)) |
| 137 |
- continue |
| 138 |
- if mypsplit[0] == mysplit[1]: |
| 139 |
- return 1 |
| 140 |
- return 0 |
| 141 |
- |
| 142 |
def populate(self): |
| 143 |
self.populated=1 |
Archives