summaryrefslogtreecommitdiff
path: root/apt-pkg/sourcelist.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-08-19 11:11:58 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2009-08-19 11:11:58 +0200
commit194f3443c4c405e86f4094efa37269a8b3b7e3e3 (patch)
treefabd3d18955ad2a8c4ff3fc47f83b0a2517521ae /apt-pkg/sourcelist.cc
parentfa1d338f0c8770d574db4f3728ef4357765185f7 (diff)
parent9a64707c285290c4e191e04d92c0fab9f6f118f5 (diff)
merged from debian-sid
Diffstat (limited to 'apt-pkg/sourcelist.cc')
-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;