diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2009-08-08 09:53:25 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2009-08-08 09:53:25 +0200 |
| commit | dee2822ae83aea4c161036a892cea6622a8e8510 (patch) | |
| tree | d7ec59b33ee0973ba36123ced62af041c6a15fac /apt-pkg | |
| parent | 2b5c0d21114e200f524c2ff199bf1ce9e0d923fa (diff) | |
| parent | 9a64707c285290c4e191e04d92c0fab9f6f118f5 (diff) | |
merge with apt-sid
* backout my fix for the sources.list issue, there is already one in
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/contrib/mmap.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/sourcelist.cc | 17 |
2 files changed, 7 insertions, 12 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 85a20f0b8..4b3abe918 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -157,25 +157,20 @@ 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; + string Parts = _config->FindDir("Dir::Etc::sourceparts"); + if (FileExists(Main) == true) Res &= ReadAppend(Main); - else - { - // only print the warning if we can't load a valid sourcefile in the end + else if (FileExists(Parts) == false) + // Only warn if there are no sources.list.d. _error->WarningE("FileExists",_("Unable to read %s"),Main.c_str()); - _error->PopMessage(noSourceMsg); - } - 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()); - if (SrcList.empty() == true && noSourceMsg.empty() == false) - _error->Warning(noSourceMsg.c_str()); - return Res; } /*}}}*/ |