summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-03-21 15:15:37 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-03-21 15:15:37 +0100
commitddf4cdd43c9b7d876376a99a4cddaf8e235472d1 (patch)
tree8debc122498868508e53f832b16e30f050b3f55c /doc
parent50cd25232b87fcf0be1a87bf2757f76a369ee175 (diff)
parente3ebbfe848d3d03baaf969374ac55641873bb798 (diff)
downloadpython-apt-ddf4cdd43c9b7d876376a99a4cddaf8e235472d1.tar.gz
* merged fix for parse_depends() in a multiarch environment
from debian/sid branch * apt/progress/text.py: - only run ioctl for termios.TIOCGWINSZ if the fd is a tty * apt/debfile.py, tests/test_debfile.py: - strip "./" from _get_content and add tests, this fixes a control file extraction bug in gdebi * python/depcache.cc: - when using the actiongroup as a contextmanager incref/decref on enter and leave. this should fix the instablity issues that aptdaemon runs into (LP: #691134) * debian/python3-apt.install: - fix py3 extension module install location (thanks to Barry) * python/depcache.cc: - provide bindings for new libapt SetCandidateRelease() * debian/control: - require new libapt-pkg-dev SetCandidateRelease() * py3 compatible exception handline * debian/control: - bump minimal python version to >= 2.6 * python/apt_pkgmodule.cc: - strip multiarch by default in RealParseDepends - add optional parameter to allow parse_depends() to keep the multiarch parameter * tests/test_deps.py: - add test forapt_pkg.parse_depends(strip_multiarch=True)
Diffstat (limited to 'doc')
-rw-r--r--doc/source/library/apt_pkg.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst
index f1bc4845..81358bac 100644
--- a/doc/source/library/apt_pkg.rst
+++ b/doc/source/library/apt_pkg.rst
@@ -1731,7 +1731,7 @@ Dependencies
The following two functions provide the ability to parse dependencies. They
use the same format as :attr:`Version.depends_list_str`.
-.. function:: parse_depends(depends)
+.. function:: parse_depends(depends, strip_multiarch=True)
Parse the string *depends* which contains dependency information as
specified in Debian Policy, Section 7.1.
@@ -1743,6 +1743,9 @@ use the same format as :attr:`Version.depends_list_str`.
>>> apt_pkg.parse_depends("PkgA (>= VerA) | PkgB (>= VerB)")
[[('PkgA', 'VerA', '>='), ('PkgB', 'VerB', '>=')]]
+ Note that multiarch dependency information is stripped off by default.
+ You can force the full dependency info (including the multiarch info)
+ by passing "False" as a additional parameter to this function.
.. note::