correct merge error
authorFabian Groffen <grobian@gentoo.org>
Sun, 27 Apr 2008 15:38:38 +0000 (15:38 -0000)
committerFabian Groffen <grobian@gentoo.org>
Sun, 27 Apr 2008 15:38:38 +0000 (15:38 -0000)
svn path=/main/branches/prefix/; revision=10000

pym/portage/dbapi/vartree.py

index c705329691a528869f825a28a8be54230d0a4318..eb4795f6a889da6a1ac4cb296108392818dfaf58 100644 (file)
@@ -16,7 +16,7 @@ from portage.output import bold, red, green
 from portage.update import fixdbentries
 from portage.util import apply_secpass_permissions, ConfigProtect, ensure_dirs, \
        writemsg, writemsg_stdout, write_atomic, atomic_ofstream, writedict, \
-       grabfile, grabdict, normalize_path, new_protect_filename
+       grabfile, grabdict, normalize_path, new_protect_filename, getlibpaths
 from portage.versions import pkgsplit, catpkgsplit, catsplit, best, pkgcmp
 
 from portage import listdir, dep_expand, flatten, key_expand, \