projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Fix compilation warnings in apt-pkg/cdrom.cc and
[apt.git]
/
apt-pkg
/
pkgcachegen.cc
diff --git
a/apt-pkg/pkgcachegen.cc
b/apt-pkg/pkgcachegen.cc
index 1106667d5a3309c023a4f7cb5c44853d1d889d0a..d00cd4e646b120641cf5cde2359956860419f3d2 100644
(file)
--- a/
apt-pkg/pkgcachegen.cc
+++ b/
apt-pkg/pkgcachegen.cc
@@
-10,10
+10,6
@@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/pkgcachegen.h"
-#endif
-
#define APT_COMPATIBILITY 986
#include <apt-pkg/pkgcachegen.h>
#define APT_COMPATIBILITY 986
#include <apt-pkg/pkgcachegen.h>
@@
-26,6
+22,8
@@
#include <apt-pkg/sptr.h>
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/sptr.h>
#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/tagfile.h>
+
#include <apti18n.h>
#include <vector>
#include <apti18n.h>
#include <vector>
@@
-152,7
+150,7
@@
bool pkgCacheGenerator::MergeList(ListParser &List,
Desc->ParentPkg = Pkg.Index();
if (NewFileDesc(Desc,List) == false)
Desc->ParentPkg = Pkg.Index();
if (NewFileDesc(Desc,List) == false)
- return _error->Error(_("Error occured while processing %s (NewFileDesc1)"),PackageName.c_str());
+ return _error->Error(_("Error occur
r
ed while processing %s (NewFileDesc1)"),PackageName.c_str());
break;
}
}
break;
}
}
@@
-244,7
+242,7
@@
bool pkgCacheGenerator::MergeList(ListParser &List,
Desc->ParentPkg = Pkg.Index();
if (NewFileDesc(Desc,List) == false)
Desc->ParentPkg = Pkg.Index();
if (NewFileDesc(Desc,List) == false)
- return _error->Error(_("Error occured while processing %s (NewFileDesc2)"),PackageName.c_str());
+ return _error->Error(_("Error occur
r
ed while processing %s (NewFileDesc2)"),PackageName.c_str());
}
FoundFileDeps |= List.HasFileDeps();
}
FoundFileDeps |= List.HasFileDeps();
@@
-676,8
+674,10
@@
static bool CheckValidity(const string &CacheFile, FileIterator Start,
if ((*Start)->Exists() == false)
{
if ((*Start)->Exists() == false)
{
+#if 0 // mvo: we no longer give a message here (Default Sources spec)
_error->WarningE("stat",_("Couldn't stat source package list %s"),
(*Start)->Describe().c_str());
_error->WarningE("stat",_("Couldn't stat source package list %s"),
(*Start)->Describe().c_str());
+#endif
continue;
}
continue;
}
@@
-781,7
+781,7
@@
static bool BuildCache(pkgCacheGenerator &Gen,
bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
MMap **OutMap,bool AllowMem)
{
bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
MMap **OutMap,bool AllowMem)
{
- unsigned long MapSize = _config->FindI("APT::Cache-Limit",
12
*1024*1024);
+ unsigned long MapSize = _config->FindI("APT::Cache-Limit",
24
*1024*1024);
vector<pkgIndexFile *> Files;
for (vector<metaIndex *>::const_iterator i = List.begin();
vector<pkgIndexFile *> Files;
for (vector<metaIndex *>::const_iterator i = List.begin();
@@
-928,7
+928,7
@@
bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
/* */
bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
{
/* */
bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
{
- unsigned long MapSize = _config->FindI("APT::Cache-Limit",
8
*1024*1024);
+ unsigned long MapSize = _config->FindI("APT::Cache-Limit",
20
*1024*1024);
vector<pkgIndexFile *> Files;
unsigned long EndOfSource = Files.size();
if (_system->AddStatusFiles(Files) == false)
vector<pkgIndexFile *> Files;
unsigned long EndOfSource = Files.size();
if (_system->AddStatusFiles(Files) == false)