From 1d29e0e4c3072a18a0748ec89af1c1b8074a35a3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 14 Oct 2011 14:51:56 +0200 Subject: cherry pick -r 2184.1.15..2184.1.18 from debian-experimental2 --- apt-pkg/deb/deblistparser.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'apt-pkg/deb') 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 /*{{{*/ -- cgit v1.2.3