X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/5dd00edbcf702cac1ea22392796c65881a8ef6f9..610e13842a3718128c03454c5dfcbde49d323281:/apt-pkg/indexfile.cc?ds=sidebyside diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 487a5b920..657cdfb36 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -107,9 +107,11 @@ bool pkgIndexFile::CheckLanguageCode(const char * const Lang) /*}}}*/ // IndexFile::LanguageCode - Return the Language Code /*{{{*/ std::string pkgIndexFile::LanguageCode() { +APT_IGNORE_DEPRECATED_PUSH if (TranslationsAvailable() == false) return ""; return APT::Configuration::getLanguages()[0]; +APT_IGNORE_DEPRECATED_POP } /*}}}*/ @@ -142,6 +144,7 @@ std::string IndexTarget::Option(OptionKeys const EnumKey) const /*{{{*/ APT_CASE(COMPRESSIONTYPES); APT_CASE(SOURCESENTRY); APT_CASE(BY_HASH); + APT_CASE(KEEPCOMPRESSEDAS); #undef APT_CASE case FILENAME: return _config->FindDir("Dir::State::lists") + URItoFileName(URI); case EXISTING_FILENAME: @@ -264,7 +267,9 @@ std::string pkgDebianIndexTargetFile::GetProgressDescription() const pkgDebianIndexRealFile::pkgDebianIndexRealFile(std::string const &pFile, bool const Trusted) :/*{{{*/ pkgDebianIndexFile(Trusted), d(NULL) { - if (pFile == "/nonexistent/stdin") + if (pFile.empty()) + ; + else if (pFile == "/nonexistent/stdin") File = pFile; else File = flAbsPath(pFile);