diff options
| author | Julian Andres Klode <jak@debian.org> | 2009-08-03 13:02:14 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2009-08-03 13:02:14 +0200 |
| commit | 67793cf3c90c40941d5445335345cf4042d44206 (patch) | |
| tree | ee6aa19a994874f7f1f0e83aaed08b517d99dbf9 | |
| parent | 9da165db08e69a0a5a467b4d02d414006590308e (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).
| -rw-r--r-- | apt-pkg/sourcelist.cc | 9 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 10 insertions, 4 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; diff --git a/debian/changelog b/debian/changelog index 4e3177efe..b360a0b23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,11 @@ apt (0.7.23) unstable; urgency=low * apt-pkg/contrib/mmap.cc: - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on non-Linux architectures (as it uses mremap). + * 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). - -- Julian Andres Klode <jak@debian.org> Sun, 02 Aug 2009 19:35:23 +0200 + -- Julian Andres Klode <jak@debian.org> Mon, 03 Aug 2009 12:48:31 +0200 apt (0.7.22) unstable; urgency=low |