projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CMake: test/libapt: Use a prebuilt GTest library if available
[apt.git]
/
apt-pkg
/
indexfile.cc
diff --git
a/apt-pkg/indexfile.cc
b/apt-pkg/indexfile.cc
index 7ded0101b66faa6a73d42e730c85dd0bc3974ce2..934943205ae6722af43d011fda57bc9bfd4ad68b 100644
(file)
--- a/
apt-pkg/indexfile.cc
+++ b/
apt-pkg/indexfile.cc
@@
-147,8
+147,17
@@
std::string IndexTarget::Option(OptionKeys const EnumKey) const /*{{{*/
APT_CASE(SOURCESENTRY);
APT_CASE(BY_HASH);
APT_CASE(KEEPCOMPRESSEDAS);
APT_CASE(SOURCESENTRY);
APT_CASE(BY_HASH);
APT_CASE(KEEPCOMPRESSEDAS);
+ APT_CASE(ALLOW_INSECURE);
+ APT_CASE(ALLOW_WEAK);
+ APT_CASE(ALLOW_DOWNGRADE_TO_INSECURE);
#undef APT_CASE
#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), ' ');
case EXISTING_FILENAME:
std::string const filename = Option(FILENAME);
std::vector<std::string> const types = VectorizeString(Option(COMPRESSIONTYPES), ' ');
@@
-170,7
+179,7
@@
std::string IndexTarget::Option(OptionKeys const EnumKey) const /*{{{*/
/*}}}*/
bool IndexTarget::OptionBool(OptionKeys const EnumKey) const /*{{{*/
{
/*}}}*/
bool IndexTarget::OptionBool(OptionKeys const EnumKey) const /*{{{*/
{
- return StringToBool(Option(EnumKey));
+ return StringToBool(Option(EnumKey)
, false
);
}
/*}}}*/
std::string IndexTarget::Format(std::string format) const /*{{{*/
}
/*}}}*/
std::string IndexTarget::Format(std::string format) const /*{{{*/