diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-10-14 15:46:37 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-10-14 15:46:37 +0200 |
| commit | 957e8c1b62b212d32d3b437461384072ef0b2e9c (patch) | |
| tree | 4abacf9e893279181114d58f961eefc5e02a28c1 /apt-pkg/deb | |
| parent | cd16c01df411b182c0cfbaff3a12b36084a79e13 (diff) | |
| parent | 3e3dfc40aa9466ca49665c26cb970e5527c3fb4c (diff) | |
* apt-pkg/pkgcachegen.cc:
- refactor MergeList by creating -Group, -Package and -Version specialist
- share description list between "same" versions (LP: #868977)
This also means that descriptions are shared across archives now.
* apt-pkg/pkgcache.cc:
- always prefer "en" over "" for "en"-language regardless of cache-order
(LP: #868977)
Diffstat (limited to 'apt-pkg/deb')
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 5 |
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 /*{{{*/ |