Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10000 - main/branches/prefix/pym/portage/dbapi
Date: Sun, 27 Apr 2008 15:38:43
Message-Id: E1Jq8xc-0004Oi-90@stork.gentoo.org
1 Author: grobian
2 Date: 2008-04-27 15:38:38 +0000 (Sun, 27 Apr 2008)
3 New Revision: 10000
4
5 Modified:
6 main/branches/prefix/pym/portage/dbapi/vartree.py
7 Log:
8 correct merge error
9
10 Modified: main/branches/prefix/pym/portage/dbapi/vartree.py
11 ===================================================================
12 --- main/branches/prefix/pym/portage/dbapi/vartree.py 2008-04-27 14:56:09 UTC (rev 9999)
13 +++ main/branches/prefix/pym/portage/dbapi/vartree.py 2008-04-27 15:38:38 UTC (rev 10000)
14 @@ -16,7 +16,7 @@
15 from portage.update import fixdbentries
16 from portage.util import apply_secpass_permissions, ConfigProtect, ensure_dirs, \
17 writemsg, writemsg_stdout, write_atomic, atomic_ofstream, writedict, \
18 - grabfile, grabdict, normalize_path, new_protect_filename
19 + grabfile, grabdict, normalize_path, new_protect_filename, getlibpaths
20 from portage.versions import pkgsplit, catpkgsplit, catsplit, best, pkgcmp
21
22 from portage import listdir, dep_expand, flatten, key_expand, \
23
24 --
25 gentoo-commits@l.g.o mailing list