diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-03-09 15:54:39 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-03-16 18:01:21 +0100 |
| commit | 2b4cead3c8eb3afb5aa5390b88c511477a7628d8 (patch) | |
| tree | 2a0872e4022bb5d67bef3509d5285d846cb86a66 /apt-pkg/deb/debmetaindex.cc | |
| parent | 2f6a2fbbdc9f76dc4eace83a427013f4e1c03afc (diff) | |
fix some new compiler warnings reported by gcc-5
Git-Dch: Ignore
Diffstat (limited to 'apt-pkg/deb/debmetaindex.cc')
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 81e067424..aa2db8149 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -402,9 +402,12 @@ class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type { // parse arch=, arch+= and arch-= settings map<string, string>::const_iterator arch = Options.find("arch"); - vector<string> Archs = - (arch != Options.end()) ? VectorizeString(arch->second, ',') : - APT::Configuration::getArchitectures(); + vector<string> Archs; + if (arch != Options.end()) + Archs = VectorizeString(arch->second, ','); + else + Archs = APT::Configuration::getArchitectures(); + if ((arch = Options.find("arch+")) != Options.end()) { std::vector<std::string> const plusArch = VectorizeString(arch->second, ','); |