summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-10-14 14:51:56 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-10-14 14:51:56 +0200
commit1d29e0e4c3072a18a0748ec89af1c1b8074a35a3 (patch)
treef59b016e873d9381aacac02cb94d1d33113063d7 /apt-pkg/deb
parentcd16c01df411b182c0cfbaff3a12b36084a79e13 (diff)
cherry pick -r 2184.1.15..2184.1.18 from debian-experimental2
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/deblistparser.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 08c24204b..89999fb44 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -69,10 +69,7 @@ string debListParser::Package() {
// ---------------------------------------------------------------------
/* This will return the Architecture of the package this section describes */
string debListParser::Architecture() {
- std::string const Arch = Section.FindS("Architecture");
- if (Arch.empty() == true)
- return _config->Find("APT::Architecture");
- return Arch;
+ return Section.FindS("Architecture");
}
/*}}}*/
// ListParser::ArchitectureAll /*{{{*/