diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-20 12:11:47 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-20 12:11:47 +0000 |
| commit | 2b9f49600e772877303a58e2d3225a51c4b8f793 (patch) | |
| tree | 74216458cc26db7740b9d2f3668ae6a89a00e93c /bin | |
| parent | 54a080bb646d640c3f53797ebb99235b98b41ad3 (diff) | |
| download | portage-2b9f49600e772877303a58e2d3225a51c4b8f793.tar.gz portage-2b9f49600e772877303a58e2d3225a51c4b8f793.tar.bz2 portage-2b9f49600e772877303a58e2d3225a51c4b8f793.zip | |
Merge missing db keys from trunk, for bug #149816.
svn path=/main/branches/2.1.2/; revision=8987
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index 25e7d304c..cf75f877e 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1217,6 +1217,11 @@ class depgraph: "binary":"bintree", "installed":"vartree"} + _mydbapi_keys = [ + "CHOST", "DEPEND", "EAPI", "IUSE", "KEYWORDS", + "LICENSE", "PDEPEND", "PROVIDE", "RDEPEND", + "repository", "RESTRICT", "SLOT", "USE"] + def __init__(self, settings, trees, myopts, myparams, spinner): self.settings = settings self.target_root = settings["ROOT"] @@ -1234,8 +1239,6 @@ class depgraph: # Maps nodes to the reasons they were selected for reinstallation. self._reinstall_nodes = {} self.mydbapi = {} - self._mydbapi_keys = ["SLOT", "DEPEND", "RDEPEND", "PDEPEND", - "USE", "IUSE", "PROVIDE", "RESTRICT", "repository"] self.trees = {} self.roots = {} for myroot in trees: @@ -1970,7 +1973,7 @@ class depgraph: msg = ("The current version of portage supports " + \ "EAPI '%s'. You must upgrade to a newer version" + \ " of portage before EAPI masked packages can" + \ - " be installed.") % portage.const.EAPI + " be installed.") % portage_const.EAPI for line in wrap(msg, 75): print line print |