diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-08-18 10:02:35 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-08-18 10:02:35 +0200 |
| commit | d1fd09b982f6108dc32ec75330b0535236c48311 (patch) | |
| tree | c0dce6cf7501c1e0d5e3bad34e9b63c0d6dcd354 /apt-pkg/indexfile.cc | |
| parent | b5fcba3682581b2a48921cc830dbf3deae6b0ff3 (diff) | |
| parent | 43670e2ef8b689d9efba633d11d2a5fc6f9968a0 (diff) | |
Merge tag '1.3_rc2' into ubuntu
apt Debian release 1.3~rc2
Diffstat (limited to 'apt-pkg/indexfile.cc')
| -rw-r--r-- | apt-pkg/indexfile.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index b1435d32c..934943205 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -151,7 +151,13 @@ std::string IndexTarget::Option(OptionKeys const EnumKey) const /*{{{*/ APT_CASE(ALLOW_WEAK); APT_CASE(ALLOW_DOWNGRADE_TO_INSECURE); #undef APT_CASE - case FILENAME: return _config->FindDir("Dir::State::lists") + URItoFileName(URI); + case FILENAME: + { + auto const M = Options.find("FILENAME"); + if (M == Options.end()) + return _config->FindDir("Dir::State::lists") + URItoFileName(URI); + return M->second; + } case EXISTING_FILENAME: std::string const filename = Option(FILENAME); std::vector<std::string> const types = VectorizeString(Option(COMPRESSIONTYPES), ' '); |