| 1 |
Author: grobian |
| 2 |
Date: 2009-09-05 10:00:22 +0000 (Sat, 05 Sep 2009) |
| 3 |
New Revision: 14187 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/archive-conf |
| 7 |
main/trunk/bin/ebuild |
| 8 |
main/trunk/pym/portage/dbapi/vartree.py |
| 9 |
Log: |
| 10 |
Fix usage of VDB_PATH |
| 11 |
|
| 12 |
Modified: main/trunk/bin/archive-conf |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/bin/archive-conf 2009-09-05 07:39:51 UTC (rev 14186) |
| 15 |
+++ main/trunk/bin/archive-conf 2009-09-05 10:00:22 UTC (rev 14187) |
| 16 |
@@ -62,7 +62,7 @@ |
| 17 |
md5_match_hash[conf] = '' |
| 18 |
|
| 19 |
# Find all the CONTENT files in VDB_PATH. |
| 20 |
- content_files += os.popen(FIND_EXTANT_CONTENTS % (portage.root+portage.VDB_PATH)).readlines() |
| 21 |
+ content_files += os.popen(FIND_EXTANT_CONTENTS % (os.path.join(portage.root, portage.VDB_PATH))).readlines() |
| 22 |
|
| 23 |
# Search for the saved md5 checksum of all the specified config files |
| 24 |
# and see if the current file is unmodified or not. |
| 25 |
|
| 26 |
Modified: main/trunk/bin/ebuild |
| 27 |
=================================================================== |
| 28 |
--- main/trunk/bin/ebuild 2009-09-05 07:39:51 UTC (rev 14186) |
| 29 |
+++ main/trunk/bin/ebuild 2009-09-05 10:00:22 UTC (rev 14187) |
| 30 |
@@ -135,7 +135,7 @@ |
| 31 |
print "!!! %s does not follow correct package syntax." % (cpv) |
| 32 |
sys.exit(1) |
| 33 |
|
| 34 |
-if ebuild.startswith(portage.root + portage.const.VDB_PATH): |
| 35 |
+if ebuild.startswith(os.path.join(portage.root, portage.const.VDB_PATH)): |
| 36 |
mytree = "vartree" |
| 37 |
|
| 38 |
portage_ebuild = portage.db[portage.root][mytree].dbapi.findname(cpv) |
| 39 |
|
| 40 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 41 |
=================================================================== |
| 42 |
--- main/trunk/pym/portage/dbapi/vartree.py 2009-09-05 07:39:51 UTC (rev 14186) |
| 43 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2009-09-05 10:00:22 UTC (rev 14187) |
| 44 |
@@ -1069,7 +1069,7 @@ |
| 45 |
return list(self._iter_match(mydep, |
| 46 |
self.cp_list(mydep.cp, use_cache=use_cache))) |
| 47 |
try: |
| 48 |
- curmtime = os.stat(self.root+VDB_PATH+"/"+mycat).st_mtime |
| 49 |
+ curmtime = os.stat(os.path.join(self.root, VDB_PATH, mycat)).st_mtime |
| 50 |
except (IOError, OSError): |
| 51 |
curmtime=0 |
Archives