aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-09-04 17:29:22 (GMT)
committerFabian Groffen <grobian@gentoo.org>2010-09-04 17:29:22 (GMT)
commit2faf56cef94ad74a529e146ba41769b4a32df58a (patch)
tree0d47ea84b7c205823ad59fc9c8eb440adc82370f
parentMerge remote branch 'overlays-gentoo-org/master' into prefix (diff)
parentfix comments to match latest intentions in the code (diff)
downloadportage-2faf56cef94ad74a529e146ba41769b4a32df58a.zip
portage-2faf56cef94ad74a529e146ba41769b4a32df58a.tar.gz
portage-2faf56cef94ad74a529e146ba41769b4a32df58a.tar.bz2
Merge remote branch 'overlays-gentoo-org/master' into prefix
Dropped EPREFIX from vars that are used with target_root accordingly. Conflicts: pym/portage/const.py
-rw-r--r--doc/dependency_resolution/decision_making.docbook2
-rw-r--r--pym/portage/const.py17
2 files changed, 9 insertions, 10 deletions
diff --git a/doc/dependency_resolution/decision_making.docbook b/doc/dependency_resolution/decision_making.docbook
index d64ff83..da679d6 100644
--- a/doc/dependency_resolution/decision_making.docbook
+++ b/doc/dependency_resolution/decision_making.docbook
@@ -13,7 +13,7 @@
<title>Delayed Evaluation of Disjunctive Dependency Choices</title>
<para>
Disjunctive dependencies, of which virtuals are a special case,
- can be satsified by multiple choices of dependency atoms. These
+ can be satisfied by multiple choices of dependency atoms. These
choices are delayed until as late as possible in the dependency
calculation, after packages have been selected to satisfy
as many non-disjunctive dependencies as possible. As a consequence
diff --git a/pym/portage/const.py b/pym/portage/const.py
index 9b64d31..dcae9b5 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -1,5 +1,5 @@
# portage: Constants
-# Copyright 1998-2009 Gentoo Foundation
+# Copyright 1998-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# ===========================================================================
@@ -35,9 +35,8 @@ EPREFIX_LSTRIP = EPREFIX.lstrip(os.path.sep)
# would expect.
# Second there is target_root (ROOT) which is used to install somewhere
# completely else, in Prefix of limited use. Because this is an offset
-# always given, the EPREFIX should always be applied in it. Those
-# constants (like VDB_PATH) are always absolute and hence DO have
-# EPREFIX prepended in Prefix.
+# always given, the EPREFIX should always be applied in it, hence the
+# code always prefixes them with EROOT.
# The variables in this file are grouped by config_root, target_root.
# variables used with config_root (these need to be relative)
@@ -55,14 +54,14 @@ MAKE_DEFAULTS_FILE = PROFILE_PATH + "/make.defaults" # FIXME: not used
DEPRECATED_PROFILE_FILE = PROFILE_PATH + "/deprecated"
# variables used with targetroot (these need to be absolute, but not
-# 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"
-PRIVATE_PATH = EPREFIX_LSTRIP + "/" + "var/lib/portage"
+# have a leading '/' since they are used directly with os.path.join on EROOT)
+VDB_PATH = "var/db/pkg"
+CACHE_PATH = "var/cache/edb"
+PRIVATE_PATH = "var/lib/portage"
WORLD_FILE = PRIVATE_PATH + "/world"
WORLD_SETS_FILE = PRIVATE_PATH + "/world_sets"
CONFIG_MEMORY_FILE = PRIVATE_PATH + "/config"
-NEWS_LIB_PATH = EPREFIX_LSTRIP + "/" + "var/lib/gentoo"
+NEWS_LIB_PATH = "var/lib/gentoo"
# these variables are not used with target_root or config_root
DEPCACHE_PATH = EPREFIX + "/var/cache/edb/dep"