diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-01 09:29:25 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-01 09:29:25 +0200 |
| commit | eec06677e01d9ba9d7edd95feb0cd858e7b8b6bc (patch) | |
| tree | 311d72500e3146002b9c5e2350a4886d3c2b4dc5 /python/pkgmanager.cc | |
| parent | 73050c16039e2adc3cb09b522a0ef36de450737e (diff) | |
| parent | c8bd732d5cb8be16ae48f8a72a4ed8a266b4ce36 (diff) | |
| download | python-apt-eec06677e01d9ba9d7edd95feb0cd858e7b8b6bc.tar.gz | |
* merged from the debian/sid bzr branch
* Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512)
* python/arfile.cc:
- use APT::Configuration::getCompressionTypes() instead of duplicating
the supported methods here
* tests/test_debfile.py:
- add test for raise on unknown data.tar.xxx
* tests/test_aptsources_ports.py, tests/test_aptsources.py:
- use tmpdir during the tests to fix test failure with apt from
experimental
* Upload to unstable
* Increase Breaks for update-notifier to 0.99.3debian9
* utils/get_debian_mirrors.py: Adjust for new Alioth SCM urls
* debian/control: Standards-Version 3.9.2
* Fix Lintian overrides
* Fix spelling errors reported by Lintian (sep[a->e]rated, overrid[d]en)
* po/urd.po: Remove, ur.po is the correct file
* debian/source/format: Add, set it to "3.0 (native)"
* Fix get_changelog in Python 3 (Closes: #626532)
* apt/package.py: fix a few typos [formated->formatted] (Closes: #597054)
* doc/source/tutorials/contributing.rst: minor improvements (Closes: #625225)
- one typo [2to => 2to3], one broken link [pep8.py link]
* Esperanto (Closes: #626430)
Diffstat (limited to 'python/pkgmanager.cc')
| -rw-r--r-- | python/pkgmanager.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc index b7bed658..f51dbbbc 100644 --- a/python/pkgmanager.cc +++ b/python/pkgmanager.cc @@ -295,24 +295,24 @@ static PyMethodDef PkgManager2Methods[] = { {"install",PkgManagerInstall,METH_VARARGS, "install(pkg: Package, filename: str) -> bool \n\n" - "Add a install action. Can be overriden in subclasses.\n\n" + "Add a install action. Can be overridden in subclasses.\n\n" "New in version 0.8.0."}, {"configure",PkgManagerConfigure,METH_VARARGS, "configure(pkg: Package) -> bool \n\n" - "Add a configure action. Can be overriden in subclasses.\n\n" + "Add a configure action. Can be overridden in subclasses.\n\n" "New in version 0.8.0."}, {"remove",PkgManagerRemove,METH_VARARGS, "remove(pkg: Package, purge: bool) -> bool \n\n" - "Add a removal action. Can be overriden in subclasses.\n\n" + "Add a removal action. Can be overridden in subclasses.\n\n" "New in version 0.8.0."}, {"go",PkgManagerGo,METH_VARARGS, "go(status_fd: int) -> bool \n\n" - "Start dpkg. Can be overriden in subclasses.\n\n" + "Start dpkg. Can be overridden in subclasses.\n\n" "New in version 0.8.0."}, {"reset",PkgManagerReset,METH_VARARGS, "reset()\n\n" "Reset the package manager for a new round.\n" - "Can be overriden in subclasses.\n\n" + "Can be overridden in subclasses.\n\n" "New in version 0.8.0."}, {} }; @@ -323,7 +323,7 @@ static const char *packagemanager2_doc = "installation and the installation of those packages. The parameter\n" "'depcache' specifies an apt_pkg.DepCache object where information\n" "about the package selections is retrieved from.\n\n" - "Methods in this class can be overriden in sub classes\n" + "Methods in this class can be overridden in sub classes\n" "to implement behavior different from APT's dpkg implementation."; PyTypeObject PyPackageManager2_Type = { |