diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-27 15:56:07 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-27 15:56:07 -0700 |
| commit | a7bce1d2f32cb0babb77c1d5134eae4187528160 (patch) | |
| tree | 83f88c8fc71ba5728a27cc478f069ccfac34ac7a | |
| parent | 960210b1a0554df0410b12e2d374b7b7da5c6e69 (diff) | |
| parent | 0c9edec008976004c7558c03a0d7d9fd718288bd (diff) | |
| download | portage-a7bce1d2f32cb0babb77c1d5134eae4187528160.tar.gz portage-a7bce1d2f32cb0babb77c1d5134eae4187528160.tar.bz2 portage-a7bce1d2f32cb0babb77c1d5134eae4187528160.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/portage
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index ea27883dd..1780b4339 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -1059,7 +1059,7 @@ class portagetree(object): """ Constructor for a PortageTree - @param root: deprectated, defaults to settings['ROOT'] + @param root: deprecated, defaults to settings['ROOT'] @type root: String/Path @param virtual: UNUSED @type virtual: No Idea diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index b0cdf9eae..c91de9356 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -261,7 +261,7 @@ class config(object): #Strictly speaking _license_manager is not immutable. Users need to ensure that #extract_global_changes() is called right after __init__ (if at all). #It also has the mutable member _undef_lic_groups. It is used to track - #undifiend license groups, to not display an error message for the same + #undefined license groups, to not display an error message for the same #group again and again. Because of this, it's useful to share it between #all LicenseManager instances. self._license_manager = clone._license_manager diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index fa8d8b139..71b55be29 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -165,7 +165,7 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None, mysettings.setcpv(mycpv, mydb=mydbapi) # config.reset() might have reverted a change made by the caller, - # so restore it to it's original value. Sandbox needs cannonical + # so restore it to its original value. Sandbox needs canonical # paths, so realpath it. mysettings["PORTAGE_TMPDIR"] = os.path.realpath(tmpdir) |