summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-03-21 13:54:50 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-03-21 13:54:50 +0100
commit2002bc4d51f80e630ea1b04964ba1d1210cf3da3 (patch)
tree47a6f9d7e667ba272de0aace4a56487a499fad98
parent2885341cf3d7a1050be1bf2a45237395a3149feb (diff)
downloadpython-apt-2002bc4d51f80e630ea1b04964ba1d1210cf3da3.tar.gz
* python/apt_pkgmodule.cc:
- strip multiarch by default in RealParseDepends
-rw-r--r--debian/changelog2
-rw-r--r--python/apt_pkgmodule.cc5
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 813144bb..0d890f44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ python-apt (0.7.100.2) UNRELEASED; urgency=low
- provide bindings for new libapt SetCandidateRelease()
* debian/control:
- require new libapt-pkg-dev SetCandidateRelease()
+ * python/apt_pkgmodule.cc:
+ - strip multiarch by default in RealParseDepends
-- Michael Vogt <mvo@debian.org> Tue, 07 Dec 2010 13:41:07 +0100
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index cacbf77a..91e8d844 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -184,7 +184,8 @@ static const char *parse_src_depends_doc =
"configuration variable APT::Architecture";
static PyObject *RealParseDepends(PyObject *Self,PyObject *Args,
bool ParseArchFlags, string name,
- bool debStyle=false)
+ bool debStyle=false,
+ bool StripMultiArch=true)
{
string Package;
string Version;
@@ -205,7 +206,7 @@ static PyObject *RealParseDepends(PyObject *Self,PyObject *Args,
break;
Start = debListParser::ParseDepends(Start,Stop,Package,Version,Op,
- ParseArchFlags);
+ ParseArchFlags, StripMultiArch);
if (Start == 0)
{
PyErr_SetString(PyExc_ValueError,"Problem Parsing Dependency");