* [gentoo-commits] portage r10370 - main/branches/2.1.2/pym
@ 2008-05-19 23:19 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-05-19 23:19 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-05-19 23:19:19 +0000 (Mon, 19 May 2008)
New Revision: 10370
Modified:
main/branches/2.1.2/pym/portage.py
Log:
Validate and normalize target_root earlier in the config constructor.
(trunk r10369)
Modified: main/branches/2.1.2/pym/portage.py
===================================================================
--- main/branches/2.1.2/pym/portage.py 2008-05-19 23:19:00 UTC (rev 10369)
+++ main/branches/2.1.2/pym/portage.py 2008-05-19 23:19:19 UTC (rev 10370)
@@ -1438,6 +1438,12 @@
if target_root is None:
target_root = "/"
+ target_root = normalize_path(os.path.abspath(
+ target_root)).rstrip(os.path.sep) + os.path.sep
+
+ portage_util.ensure_dirs(target_root)
+ check_var_directory("ROOT", target_root)
+
# The expand_map is used for variable substitution
# in getconfig() calls, and the getconfig() calls
# update expand_map with the value of each variable
@@ -1551,12 +1557,6 @@
cfg.pop(blacklisted, None)
del blacklisted, cfg
- target_root = normalize_path(os.path.abspath(
- target_root)).rstrip(os.path.sep) + os.path.sep
-
- portage_util.ensure_dirs(target_root)
- check_var_directory("ROOT", target_root)
-
self["PORTAGE_CONFIGROOT"] = config_root
self.backup_changes("PORTAGE_CONFIGROOT")
self["ROOT"] = target_root
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-05-19 23:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-19 23:19 [gentoo-commits] portage r10370 - main/branches/2.1.2/pym Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox