[gentoo-commits] portage r14200 - main/branches/prefix/pym/portage

[Fabian Groffen (grobian)]

Author: grobian
Date: 2009-09-05 13:36:07 +0000 (Sat, 05 Sep 2009)
New Revision: 14200

Modified:
   main/branches/prefix/pym/portage/const.py
Log:
   Merged from trunk -r14198:14199

   | 14199   | DEPCACHE_PATH is not used with ROOT at all, so move it out   |
   | grobian | of the target_root variable group                            |


Modified: main/branches/prefix/pym/portage/const.py
===================================================================
--- main/branches/prefix/pym/portage/const.py	2009-09-05 13:33:29 UTC (rev 14199)
+++ main/branches/prefix/pym/portage/const.py	2009-09-05 13:36:07 UTC (rev 14200)
@@ -58,7 +58,6 @@
 # have a leading '/' since they are used directly with os.path.join)
 VDB_PATH                 = EPREFIX_LSTRIP + "/" + "var/db/pkg"
 CACHE_PATH               = EPREFIX_LSTRIP + "/" + "var/cache/edb"
-DEPCACHE_PATH            = CACHE_PATH + "/dep"  # FIXME: does not seem to use ROOT when used
 PRIVATE_PATH             = EPREFIX_LSTRIP + "/" + "var/lib/portage"
 WORLD_FILE               = PRIVATE_PATH + "/world"
 WORLD_SETS_FILE          = PRIVATE_PATH + "/world_sets"
@@ -66,6 +65,7 @@
 NEWS_LIB_PATH            = EPREFIX_LSTRIP + "/" + "var/lib/gentoo"
 
 # these variables are not used with target_root or config_root
+DEPCACHE_PATH            = EPREFIX + "/var/cache/edb/dep"
 GLOBAL_CONFIG_PATH       = DATADIR + "/portage/config"
 PORTAGE_BASE_PATH        = PORTAGE_BASE
 PORTAGE_BIN_PATH         = PORTAGE_BASE_PATH + "/bin"