| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-28 09:25:56 +0000 (Tue, 28 Oct 2008) |
| 3 |
New Revision: 11733 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
Fix some incorrect $ROOT handling inside LinkageMap. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-10-28 09:07:39 UTC (rev 11732) |
| 14 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-10-28 09:25:56 UTC (rev 11733) |
| 15 |
@@ -244,7 +244,8 @@ |
| 16 |
obj = fields[1] |
| 17 |
obj_key = self._ObjectKey(obj, root) |
| 18 |
soname = fields[2] |
| 19 |
- path = set([normalize_path(x) |
| 20 |
+ path = set([ |
| 21 |
+ normalize_path(os.path.join(self._root, x.lstrip(os.path.sep))) |
| 22 |
for x in filter(None, fields[3].replace( |
| 23 |
"${ORIGIN}", os.path.dirname(obj)).replace( |
| 24 |
"$ORIGIN", os.path.dirname(obj)).split(":"))]) |
| 25 |
@@ -519,7 +520,8 @@ |
| 26 |
for provider_key in self._libs[soname][arch]["providers"]: |
| 27 |
providers = self._obj_properties[provider_key][4] |
| 28 |
for provider in providers: |
| 29 |
- if os.path.dirname(provider) in path: |
| 30 |
+ if os.path.join(self._root, |
| 31 |
+ os.path.dirname(provider).lstrip(os.path.sep)) in path: |
| 32 |
rValue[soname].add(provider) |
| 33 |
return rValue |
| 34 |
|
| 35 |
@@ -571,8 +573,8 @@ |
| 36 |
# have any consumers. |
| 37 |
if not isinstance(obj, self._ObjectKey): |
| 38 |
soname = self._obj_properties[obj_key][3] |
| 39 |
- obj_dir = os.path.dirname(obj) |
| 40 |
- master_link = os.path.join(obj_dir, soname) |
| 41 |
+ master_link = os.path.join(self._root, |
| 42 |
+ os.path.dirname(obj).lstrip(os.path.sep), soname) |
| 43 |
try: |
| 44 |
master_st = os.stat(master_link) |
| 45 |
obj_st = os.stat(obj) |
Archives