summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbin/glsa-check4
-rw-r--r--cnf/make.conf.sparc.diff2
-rw-r--r--doc/package/ebuild/eapi/4.docbook4
-rw-r--r--make.conf.txt2
-rw-r--r--man/ebuild.54
-rw-r--r--man/make.conf.52
-rw-r--r--pym/_emerge/depgraph.py18
-rw-r--r--pym/_emerge/main.py2
-rw-r--r--pym/_emerge/resolver/output_helpers.py4
-rw-r--r--pym/portage/cvstree.py6
-rw-r--r--pym/portage/mail.py10
-rw-r--r--pym/portage/output.py4
-rw-r--r--pym/portage/tests/resolver/ResolverPlayground.py8
-rw-r--r--pym/portage/update.py4
-rw-r--r--pym/portage/xml/metadata.py4
15 files changed, 39 insertions, 39 deletions
diff --git a/bin/glsa-check b/bin/glsa-check
index d8745b062..2f2d55523 100755
--- a/bin/glsa-check
+++ b/bin/glsa-check
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# Copyright 2008-2009 Gentoo Foundation
+# Copyright 2008-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
@@ -94,7 +94,7 @@ elif mode != "list" and not params:
parser.print_help()
sys.exit(1)
elif mode in ["fix", "inject"] and os.geteuid() != 0:
- # we need root priviledges for write access
+ # we need root privileges for write access
sys.stderr.write("\nThis tool needs root access to "+options.mode+" this GLSA\n\n")
sys.exit(2)
elif mode == "list" and not params:
diff --git a/cnf/make.conf.sparc.diff b/cnf/make.conf.sparc.diff
index e73357b08..e016a0b1e 100644
--- a/cnf/make.conf.sparc.diff
+++ b/cnf/make.conf.sparc.diff
@@ -8,7 +8,7 @@
+# ============
+# This should be left to the default value of sparc-unknown-linux-gnu unless
+# you are absolutely certain of the consequences. In addition to potentially
-+# destroying your system, you will recieve no support and your bugs will be
++# destroying your system, you will receive no support and your bugs will be
+# marked INVALID if you change this.
+#
+# CHOST="sparc-unknown-linux-gnu"
diff --git a/doc/package/ebuild/eapi/4.docbook b/doc/package/ebuild/eapi/4.docbook
index 83ba0dda5..8dd0f1487 100644
--- a/doc/package/ebuild/eapi/4.docbook
+++ b/doc/package/ebuild/eapi/4.docbook
@@ -150,7 +150,7 @@ This new REQUIRED_USE metadata key is used to specify what USE flag combinations
<section id='package-ebuild-eapi-4-metadata-required-use-motivation'>
<title>Motivation</title>
<para>
-It's a semi common occurence that an ebuild may need to state that they disallow USE flags in specific combinations- either mysql or sqlite for example, but not both.
+It's a semi common occurrence that an ebuild may need to state that they disallow USE flags in specific combinations- either mysql or sqlite for example, but not both.
</para>
<para>
Existing solutions rely on checking the the USE configuration in pkg_setup which is non-optimal due to pkg_setup being ran potentially hours after the initial emerge -p invocation.
@@ -166,7 +166,7 @@ The only way to find out if the USE state is disallowed is to run the code
</listitem>
<listitem>
<para>
-The common implementation of this can result in an iterative process where the user hits a USE constraint, fixs it, reruns the emerge invocation only to find that there is another constraint still violated for the ebuild, thus requiring them to fix it, rerun emerge, etc.
+The common implementation of this can result in an iterative process where the user hits a USE constraint, fixes it, reruns the emerge invocation only to find that there is another constraint still violated for the ebuild, thus requiring them to fix it, rerun emerge, etc.
</para>
</listitem>
<listitem>
diff --git a/make.conf.txt b/make.conf.txt
index 5bbb6e346..beb4b0c5c 100644
--- a/make.conf.txt
+++ b/make.conf.txt
@@ -316,7 +316,7 @@ GENTOO_MIRRORS
:default: http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo
:valdesc: space separated list of mirror locations
-Insert your space-seperated list of local mirrors here. These locations are
+Insert your space-separated list of local mirrors here. These locations are
used to download files before the ones listed in the ebuild scripts. Merging
'app-portage/mirrorselect' can help to select an appropriate mirror.
diff --git a/man/ebuild.5 b/man/ebuild.5
index 1067f82ee..87f658d06 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Feb 2011" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "May 2011" "Portage VERSION" "Portage"
.SH "NAME"
ebuild \- the internal format, variables, and functions in an ebuild script
.SH "DESCRIPTION"
@@ -1012,7 +1012,7 @@ Strips all executable files of debugging symboles. This includes libraries.
.TP
\fBprepstrip\fR \fI[dir]\fR
.PD 1
-Similiar to the \fBprepall\fR functions, these are subtle in their differences.
+Similar to the \fBprepall\fR functions, these are subtle in their differences.
.RS
.PD 0
.TP
diff --git a/man/make.conf.5 b/man/make.conf.5
index b894cdd80..bec815850 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -533,7 +533,7 @@ For more information, see the \fIInvoking GCC\fR section of the gcc manual:
http://gcc.gnu.org/onlinedocs/
.TP
\fBGENTOO_MIRRORS\fR = \fI[URIs]\fR
-Insert your space\-seperated list of local mirrors here. These
+Insert your space\-separated list of local mirrors here. These
locations are used to download files before the ones listed in
the \fIebuild scripts\fR. Merging 'mirrorselect' can help. Entries in this
variable that have no protocol and simply start with a '/' path separator may
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__ = (
diff --git a/pym/portage/cvstree.py b/pym/portage/cvstree.py
index f36e9230c..de580f57e 100644
--- a/pym/portage/cvstree.py
+++ b/pym/portage/cvstree.py
@@ -1,5 +1,5 @@
# cvstree.py -- cvs tree utilities
-# Copyright 1998-2004 Gentoo Foundation
+# Copyright 1998-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
@@ -199,8 +199,8 @@ def apply_cvsignore_filter(list):
def getentries(mydir,recursive=0):
"""(basedir,recursive=0)
- Scans the given directory and returns an datadict of all the entries in
- the directory seperated as a dirs dict and a files dict."""
+ Scans the given directory and returns a datadict of all the entries in
+ the directory separated as a dirs dict and a files dict."""
myfn=mydir+"/CVS/Entries"
# entries=[dirs, files]
entries={"dirs":{},"files":{}}
diff --git a/pym/portage/mail.py b/pym/portage/mail.py
index aa41854c3..688b5181d 100644
--- a/pym/portage/mail.py
+++ b/pym/portage/mail.py
@@ -107,8 +107,8 @@ def send_mail(mysettings, message):
myrecipient = "root@localhost"
# Syntax for PORTAGE_ELOG_MAILURI (if defined):
- # adress [[user:passwd@]mailserver[:port]]
- # where adress: recipient adress
+ # address [[user:passwd@]mailserver[:port]]
+ # where address: recipient address
# user: username for smtp auth (defaults to none)
# passwd: password for smtp auth (defaults to none)
# mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
@@ -159,7 +159,7 @@ def send_mail(mysettings, message):
myconn = smtplib.SMTP(mymailhost, int(mymailport) - 100000)
myconn.ehlo()
if not myconn.has_extn("STARTTLS"):
- raise portage.exception.PortageException(_("!!! TLS support requested for logmail but not suported by server"))
+ raise portage.exception.PortageException(_("!!! TLS support requested for logmail but not supported by server"))
myconn.starttls()
myconn.ehlo()
else:
@@ -171,8 +171,8 @@ def send_mail(mysettings, message):
myconn.sendmail(myfrom, myrecipient, message_str)
myconn.quit()
except smtplib.SMTPException as e:
- raise portage.exception.PortageException(_("!!! An error occured while trying to send logmail:\n")+str(e))
+ raise portage.exception.PortageException(_("!!! An error occurred while trying to send logmail:\n")+str(e))
except socket.error as e:
- raise portage.exception.PortageException(_("!!! A network error occured while trying to send logmail:\n%s\nSure you configured PORTAGE_ELOG_MAILURI correctly?") % str(e))
+ raise portage.exception.PortageException(_("!!! A network error occurred while trying to send logmail:\n%s\nSure you configured PORTAGE_ELOG_MAILURI correctly?") % str(e))
return
diff --git a/pym/portage/output.py b/pym/portage/output.py
index 5e8b89e0e..a0846b392 100644
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -1,4 +1,4 @@
-# Copyright 1998-2009 Gentoo Foundation
+# Copyright 1998-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
__docformat__ = "epytext"
@@ -181,7 +181,7 @@ def _parse_color_map(config_root='/', onerror=None):
split_line = line.split("=")
if len(split_line) != 2:
- e = ParseError(_("'%s', line %s: expected exactly one occurence of '=' operator") % \
+ e = ParseError(_("'%s', line %s: expected exactly one occurrence of '=' operator") % \
(myfile, lineno))
raise e
if onerror:
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index f5bd77ff2..2020cf370 100644
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -26,9 +26,9 @@ from _emerge.RootConfig import RootConfig
class ResolverPlayground(object):
"""
- This class help to create the necessary files on disk and
+ This class helps to create the necessary files on disk and
the needed settings instances, etc. for the resolver to do
- it's work.
+ its work.
"""
config_files = frozenset(("package.use", "package.mask", "package.keywords", \
@@ -37,7 +37,7 @@ class ResolverPlayground(object):
def __init__(self, ebuilds={}, installed={}, profile={}, repo_configs={}, \
user_config={}, sets={}, world=[], debug=False):
"""
- ebuilds: cpv -> metadata mapping simulating avaiable ebuilds.
+ ebuilds: cpv -> metadata mapping simulating available ebuilds.
installed: cpv -> metadata mapping simulating installed packages.
If a metadata key is missing, it gets a default value.
profile: settings defined by the profile.
@@ -487,7 +487,7 @@ class ResolverPlaygroundTestCase(object):
checks = dict.fromkeys(result.checks)
for key, value in self._checks.items():
if not key in checks:
- raise KeyError("Not an avaiable check: '%s'" % key)
+ raise KeyError("Not an available check: '%s'" % key)
checks[key] = value
fail_msgs = []
diff --git a/pym/portage/update.py b/pym/portage/update.py
index bac09c2ac..4e5e78e5b 100644
--- a/pym/portage/update.py
+++ b/pym/portage/update.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import codecs
@@ -310,7 +310,7 @@ def update_config_files(config_root, protect, protect_mask, update_iter, match_c
write_atomic(updating_file, "".join(file_contents[x]))
except PortageException as e:
writemsg("\n!!! %s\n" % str(e), noiselevel=-1)
- writemsg(_("!!! An error occured while updating a config file:") + \
+ writemsg(_("!!! An error occurred while updating a config file:") + \
" '%s'\n" % updating_file, noiselevel=-1)
continue
diff --git a/pym/portage/xml/metadata.py b/pym/portage/xml/metadata.py
index 21e9a5d6b..7acc1f3d6 100644
--- a/pym/portage/xml/metadata.py
+++ b/pym/portage/xml/metadata.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Gentoo Foundation
+# Copyright 2010-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
"""Provides an easy-to-use python interface to Gentoo's metadata.xml file.
@@ -79,7 +79,7 @@ class _Useflag(object):
@type name: str or None
@ivar name: USE flag
@type restrict: str or None
- @ivar restrict: e.g. &gt;=portage-2.2 means flag is only avaiable in
+ @ivar restrict: e.g. &gt;=portage-2.2 means flag is only available in
versions greater than 2.2
@type description: str
@ivar description: description of the USE flag
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-01 09:07:17 +0000