Add back rstrip(os.path.sep) from the previous commit since it's needed when ROOT...
authorZac Medico <zmedico@gentoo.org>
Thu, 15 Mar 2007 20:27:25 +0000 (20:27 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 15 Mar 2007 20:27:25 +0000 (20:27 -0000)
svn path=/main/trunk/; revision=6211

pym/portage/__init__.py

index 8dbc3bbe7739e6ae7e6059d6f6d7c45b8a926c67..12980463253f55621486c09e3081756307103713 100644 (file)
@@ -926,8 +926,8 @@ class config:
                        if config_root is None:
                                config_root = "/"
 
-                       config_root = \
-                               normalize_path(os.path.abspath(config_root)) + os.path.sep
+                       config_root = normalize_path(os.path.abspath(
+                               config_root)).rstrip(os.path.sep) + os.path.sep
 
                        check_var_directory("PORTAGE_CONFIGROOT", config_root)
 
@@ -1178,8 +1178,8 @@ class config:
                        if target_root is None:
                                target_root = "/"
 
-                       target_root = \
-                               normalize_path(os.path.abspath(target_root)) + os.path.sep
+                       target_root = normalize_path(os.path.abspath(
+                               target_root)).rstrip(os.path.sep) + os.path.sep
 
                        check_var_directory("ROOT", target_root)