From: Fabian Groffen Date: Sun, 27 Apr 2008 15:38:38 +0000 (-0000) Subject: correct merge error X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dfc6422a1af76bb245a57f022609dff9685c8753;p=portage.git correct merge error svn path=/main/branches/prefix/; revision=10000 --- diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index c70532969..eb4795f6a 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -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, \