Add back the rstrip(os.path.sep) which is needed in the case where ROOT=/ (regression...
authorZac Medico <zmedico@gentoo.org>
Mon, 15 May 2006 04:20:22 +0000 (04:20 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 15 May 2006 04:20:22 +0000 (04:20 -0000)
svn path=/main/trunk/; revision=3358

pym/portage.py

index d3814f29430a43bb2fe52b7c9aa4aed39290f56a..4cdf52208a3de2fc2823b9149a62685ee892f7d7 100644 (file)
@@ -968,8 +968,10 @@ class config:
                        # backupenv is for calculated incremental variables.
                        self.backupenv = os.environ.copy()
 
-                       config_root = os.path.normpath(config_root) + os.path.sep
-                       target_root = os.path.normpath(target_root) + os.path.sep
+                       config_root = \
+                               os.path.normpath(config_root).rstrip(os.path.sep) + os.path.sep
+                       target_root = \
+                               os.path.normpath(target_root).rstrip(os.path.sep) + os.path.sep
 
                        for k, v in (("PORTAGE_CONFIGROOT", config_root),
                                ("ROOT", target_root)):