diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-08-19 11:11:58 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-08-19 11:11:58 +0200 |
| commit | 194f3443c4c405e86f4094efa37269a8b3b7e3e3 (patch) | |
| tree | fabd3d18955ad2a8c4ff3fc47f83b0a2517521ae /apt-pkg | |
| parent | fa1d338f0c8770d574db4f3728ef4357765185f7 (diff) | |
| parent | 9a64707c285290c4e191e04d92c0fab9f6f118f5 (diff) | |
merged from debian-sid
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/contrib/mmap.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/sourcelist.cc | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index aa52b4c30..4d5fcf71e 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -317,7 +317,7 @@ unsigned long DynamicMMap::WriteString(const char *String, but why we should not at least try to grow it before we give up? */ bool DynamicMMap::Grow() { -#ifdef _POSIX_MAPPED_FILES +#if defined(_POSIX_MAPPED_FILES) && defined(__linux__) unsigned long newSize = WorkSpace + 1024*1024; if(Fd != 0) 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; |