Fix some typos.

diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py
index acc38d3cab6e0e306a12d42e1ed4edf90757b7e1..cfb32ad5da66ced0516f0b467f970c08af44acfd 100644 (file)
--- a/pym/_emerge/Binpkg.py
+++ b/pym/_emerge/Binpkg.py
@@ -92,7 +92,7 @@ class Binpkg(CompositeTask):
                pkg_count = self.pkg_count
                if not (self.opts.pretend or self.opts.fetchonly):
                        self._build_dir.lock()
-                       # Initialze PORTAGE_LOG_FILE (clean_log won't work without it).
+                       # Initialize PORTAGE_LOG_FILE (clean_log won't work without it).
                        portage.prepare_build_dirs(self.settings["ROOT"], self.settings, 1)
                        # If necessary, discard old log so that we don't
                        # append to it.

diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index 0db2cd412f9e27e911bf31650928408ead24e8ed..212d5df6918fe67660b9c712a979d7790d2554fa 100644 (file)
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -47,7 +47,7 @@ class FakeVartree(vartree):
                self._pkg_cache = pkg_cache
                self.dbapi = FakeVardbapi(real_vartree.settings)
 
-               # Intialize variables needed for lazy cache pulls of the live ebuild
+               # Initialize variables needed for lazy cache pulls of the live ebuild
                # metadata.  This ensures that the vardb lock is released ASAP, without
                # being delayed in case cache generation is triggered.
                self._aux_get = self.dbapi.aux_get

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 69fe002989e2f5d6e72be6ae6e0c873d5b6e7599..cb9c5d4c095e332d9047725257ff2b10ca586ffd 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2937,7 +2937,7 @@ class depgraph(object):
                is consistent such that initially satisfied deep dependencies are not
                broken in the new graph. Initially unsatisfied dependencies are
                irrelevant since we only want to avoid breaking dependencies that are
-               intially satisfied.
+               initially satisfied.
 
                Since this method can consume enough time to disturb users, it is
                currently only enabled by the --complete-graph option.

diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index 9c3d137950a207d04b9c2e894f65037911c65749..c2156850e39cd48dec872e3271813f97f6218aa2 100644 (file)
--- a/pym/_emerge/resolver/slot_collision.py
+++ b/pym/_emerge/resolver/slot_collision.py
@@ -225,7 +225,7 @@ class slot_conflict_handler(object):
 
                                        msg.append(" pulled in by\n")
 
-                                       selected_for_dispaly = set()
+                                       selected_for_display = set()
 
                                        for (type, sub_type), parents in collision_reasons.items():
                                                #From each (type, sub_type) pair select at least one atom.
@@ -246,7 +246,7 @@ class slot_conflict_handler(object):
                                                                                best_matches[atom.cp] = (ppkg, atom)
                                                                else:
                                                                        best_matches[atom.cp] = (ppkg, atom)
-                                                       selected_for_dispaly.update(best_matches.values())
+                                                       selected_for_display.update(best_matches.values())
                                                elif type == "use":
                                                        #Prefer atoms with unconditional use deps over, because it's
                                                        #not possible to change them on the parent, which means there
@@ -271,8 +271,8 @@ class slot_conflict_handler(object):
                                                        else:
                                                                matches = conditional_matches
                                                        
-                                                       if not selected_for_dispaly.intersection(matches):
-                                                               selected_for_dispaly.add(matches.pop())
+                                                       if not selected_for_display.intersection(matches):
+                                                               selected_for_display.add(matches.pop())
 
                                        def highlight_violations(atom, version, use=[]):
                                                """Colorize parts of an atom"""
@@ -308,7 +308,7 @@ class slot_conflict_handler(object):
                                                
                                                return atom_str
 
-                                       for parent_atom in selected_for_dispaly:
+                                       for parent_atom in selected_for_display:
                                                parent, atom = parent_atom
                                                msg.append(2*indent)
                                                if isinstance(parent,
@@ -337,15 +337,15 @@ class slot_conflict_handler(object):
                                                        msg.append("%s required by %s" % (atom_str, parent))
                                                msg.append("\n")
                                        
-                                       if not selected_for_dispaly:
+                                       if not selected_for_display:
                                                msg.append(2*indent)
                                                msg.append("(no parents that aren't satisfied by other packages in this slot)\n")
                                                self.conflict_is_unspecific = True
                                        
-                                       omitted_parents = num_all_specific_atoms - len(selected_for_dispaly)
+                                       omitted_parents = num_all_specific_atoms - len(selected_for_display)
                                        if omitted_parents:
                                                msg.append(2*indent)
-                                               if len(selected_for_dispaly) > 1:
+                                               if len(selected_for_display) > 1:
                                                        msg.append("(and %d more with the same problems)\n" % omitted_parents)
                                                else:
                                                        msg.append("(and %d more with the same problem)\n" % omitted_parents)