From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 9 Nov 2008 17:19:55 +0000 (-0000)
Subject: When adding parent directories to contents inside
X-Git-Tag: v2.2_rc14~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=abe0bb8950678a95f2efa2a41f805f0f06df43b0;p=portage.git

When adding parent directories to contents inside
dblink._add_preserve_libs_to_contents(), account for the trailing slash on
$ROOT in the while loop.

svn path=/main/trunk/; revision=11836
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index d2a123934..418624598 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2592,7 +2592,7 @@ class dblink(object):
 			showMessage(">>> needed    %s %s\n" % (obj_type, f_abs))
 			# Add parent directories to contents if necessary.
 			parent_dir = os.path.dirname(f_abs)
-			while parent_dir != root:
+			while len(parent_dir) > len(root):
 				new_contents[parent_dir] = ["dir"]
 				prev = parent_dir
 				parent_dir = os.path.dirname(parent_dir)