diff options
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/depgraph.py | 18 | ||||
| -rw-r--r-- | pym/_emerge/main.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/resolver/output_helpers.py | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 80e35c4b5..5004e6c45 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5532,7 +5532,7 @@ class depgraph(object): def _display_autounmask(self): """ - Display --autounmask message and optionally write them to config files + Display --autounmask message and optionally write it to config files (using CONFIG_PROTECT). The message includes the comments and the changes. """ @@ -5658,12 +5658,12 @@ class depgraph(object): def find_config_file(abs_user_config, file_name): """ - Searches /etc/portage for an appropiate file to append changes to. - If the file_name is a file it is returned, if it is a directoy, the + Searches /etc/portage for an appropriate file to append changes to. + If the file_name is a file it is returned, if it is a directory, the last file in it is returned. - file_name - String containg a file name like "package.use" - return value - String. Absolte path of file to write to. None if + file_name - String containing a file name like "package.use" + return value - String. Absolute path of file to write to. None if no suitable file exists. """ file_path = os.path.join(abs_user_config, file_name) @@ -5675,7 +5675,7 @@ class depgraph(object): files = sorted(f for f in os.listdir(file_path) \ if os.path.isfile(os.path.join(file_path, f))) if len(files) != 0: - return os.path.join(file_path, files[-1]) + return os.path.join(file_path, files[-1]) except OSError: pass @@ -5763,11 +5763,11 @@ class depgraph(object): file_to_write_to.get((abs_user_config, "package.license"))) if problems: - writemsg_stdout("\nThe following problems occured while writing autounmask changes:\n", \ + writemsg_stdout("\nThe following problems occurred while writing autounmask changes:\n", \ noiselevel=-1) writemsg_stdout("".join(problems), noiselevel=-1) elif write_to_file and roots: - writemsg_stdout("\nAutounmask changes successfully written. Remeber to run etc-update.\n", \ + writemsg_stdout("\nAutounmask changes successfully written. Remember to run etc-update.\n", \ noiselevel=-1) elif not pretend and not autounmask_write and roots: writemsg_stdout("\nUse --autounmask-write to write changes to config files (honoring CONFIG_PROTECT).\n", \ @@ -5786,7 +5786,7 @@ class depgraph(object): go to stdout for parsing by programs such as autounmask. """ - # Note that show_masked_packages() sends it's output to + # Note that show_masked_packages() sends its output to # stdout, and some programs such as autounmask parse the # output in cases when emerge bails out. However, when # show_masked_packages() is called for installed packages diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 7921d7d1c..11d8ca1cc 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1349,7 +1349,7 @@ def expand_set_arguments(myfiles, myaction, root_config): sets = setconfig.getSets() - # display errors that occured while loading the SetConfig instance + # display errors that occurred while loading the SetConfig instance for e in setconfig.errors: print(colorize("BAD", "Error during set creation: %s" % e)) diff --git a/pym/_emerge/resolver/output_helpers.py b/pym/_emerge/resolver/output_helpers.py index ff6327f4a..874660f69 100644 --- a/pym/_emerge/resolver/output_helpers.py +++ b/pym/_emerge/resolver/output_helpers.py @@ -1,7 +1,7 @@ -# Copyright 2010 Gentoo Foundation +# Copyright 2010-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -"""Contains private suport functions for the Display class +"""Contains private support functions for the Display class in output.py """ __all__ = ( |