summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2009-08-03 13:02:14 +0200
committerJulian Andres Klode <jak@debian.org>2009-08-03 13:02:14 +0200
commit67793cf3c90c40941d5445335345cf4042d44206 (patch)
treeee6aa19a994874f7f1f0e83aaed08b517d99dbf9 /apt-pkg
parent9da165db08e69a0a5a467b4d02d414006590308e (diff)
* apt-pkg/sourcelist.cc:
- Only warn about missing sources.list if there is no sources.list.d and vice versa as only one of them is needed (Closes: #539731).
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/sourcelist.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 47a08ad90..4b3abe918 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -157,15 +157,18 @@ bool pkgSourceList::ReadMainList()
// CNC:2003-11-28 - Entries in sources.list have priority over
// entries in sources.list.d.
string Main = _config->FindFile("Dir::Etc::sourcelist");
+ string Parts = _config->FindDir("Dir::Etc::sourceparts");
+
if (FileExists(Main) == true)
Res &= ReadAppend(Main);
- else
+ else if (FileExists(Parts) == false)
+ // Only warn if there are no sources.list.d.
_error->WarningE("FileExists",_("Unable to read %s"),Main.c_str());
- string Parts = _config->FindDir("Dir::Etc::sourceparts");
if (FileExists(Parts) == true)
Res &= ReadSourceDir(Parts);
- else
+ else if (FileExists(Main) == false)
+ // Only warn if there is no sources.list file.
_error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str());
return Res;