rred: If there were I/O errors, fail

[apt.git] / apt-pkg / indexfile.cc

diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 487a5b920977a4ea942f67263321e79a7e825b3b..657cdfb365dc64fecbcd2105f77ab5d6169fafc8 100644 (file)
--- 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() {
                                                                        /*}}}*/
 // IndexFile::LanguageCode - Return the Language Code                  /*{{{*/
 std::string pkgIndexFile::LanguageCode() {

+APT_IGNORE_DEPRECATED_PUSH

        if (TranslationsAvailable() == false)
                return "";
        return APT::Configuration::getLanguages()[0];
        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(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:
 #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)
 {
 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);
       File = pFile;
    else
       File = flAbsPath(pFile);