add options to disable specific checksums for Indexes

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

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index e13472fa664feb1cfa8f3632c9bfddb802a7e3ef..851eefdfe7547c1090172685fd74cd3787fabeae 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -197,17 +197,17 @@ bool pkgSourceList::ReadMainList()
    string Main = _config->FindFile("Dir::Etc::sourcelist");
    string Parts = _config->FindDir("Dir::Etc::sourceparts");
    
    string Main = _config->FindFile("Dir::Etc::sourcelist");
    string Parts = _config->FindDir("Dir::Etc::sourceparts");
    

-   if (FileExists(Main) == true)
+   if (RealFileExists(Main) == true)

       Res &= ReadAppend(Main);
       Res &= ReadAppend(Main);

-   else if (FileExists(Parts) == false)
+   else if (DirectoryExists(Parts) == false)

       // Only warn if there are no sources.list.d.
       // Only warn if there are no sources.list.d.

-      _error->WarningE("FileExists",_("Unable to read %s"),Main.c_str());
+      _error->WarningE("DirectoryExists", _("Unable to read %s"), Parts.c_str());

 
 

-   if (FileExists(Parts) == true)
+   if (DirectoryExists(Parts) == true)

       Res &= ReadSourceDir(Parts);
       Res &= ReadSourceDir(Parts);

-   else if (FileExists(Main) == false)
+   else if (RealFileExists(Main) == false)

       // Only warn if there is no sources.list file.
       // Only warn if there is no sources.list file.

-      _error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str());
+      _error->WarningE("RealFileExists", _("Unable to read %s"), Main.c_str());

 
    return Res;
 }
 
    return Res;
 }