summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2009-07-31 15:50:19 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2009-07-31 15:50:19 +0200
commit29d0b55e368aa2ae26ad61f7ecd60b723a3a4e05 (patch)
tree1490a43d01367dd7fe877db7c3416cf706d39eea /apt-pkg
parent973439b6251ce363f44da5afe89cf73214cbfc70 (diff)
[apt-pkg/sourcelist.cc] only display the warning about missing sources.list
file, if no SourceListEntry exists (e.g. sources.list.d dir does not exists or it exists but does not include a .list-file with valid entries)
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/sourcelist.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 47a08ad90..85a20f0b8 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -157,10 +157,15 @@ 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 noSourceMsg;
if (FileExists(Main) == true)
Res &= ReadAppend(Main);
else
+ {
+ // only print the warning if we can't load a valid sourcefile in the end
_error->WarningE("FileExists",_("Unable to read %s"),Main.c_str());
+ _error->PopMessage(noSourceMsg);
+ }
string Parts = _config->FindDir("Dir::Etc::sourceparts");
if (FileExists(Parts) == true)
@@ -168,6 +173,9 @@ bool pkgSourceList::ReadMainList()
else
_error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str());
+ if (SrcList.empty() == true && noSourceMsg.empty() == false)
+ _error->Warning(noSourceMsg.c_str());
+
return Res;
}
/*}}}*/