From 8a7bd39bdc6e993cd64c639e9e535a380846c2e9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 14 Jun 2007 11:05:18 +0200 Subject: * apt-pkg/depcache.cc: - merge missing bugfix from ubuntu branch --- apt-pkg/depcache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-pkg') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index fe981ea76..5979f8379 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1150,7 +1150,7 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) string s = _config->Find("APT::Install-Recommends-Section",""); if(s.size() > 0) { - const char *sec = Dep.TargetPkg().Section(); + const char *sec = Dep.ParentVer().Section(); if (sec && strcmp(sec, s.c_str()) == 0) return true; } -- cgit v1.2.3 From a7955daaf532107f70d70d4baa8f7692f6dd048a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Jun 2007 11:49:08 +0200 Subject: * fixed compile errors with g++ 7.3 (thanks to Daniel Burrows, closes: #429378) * fix FTFBFS by changing build-depends to libcurl4-gnutls-dev (closes: #428363) --- apt-pkg/contrib/strutl.h | 1 + apt-pkg/depcache.h | 1 + apt-pkg/pkgcachegen.h | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'apt-pkg') diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index ae1244ecd..53146ced7 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -20,6 +20,7 @@ #include #include +#include #include #include #include diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 84fed7f37..7adf6fe7f 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -45,6 +45,7 @@ #include #include +#include class pkgDepCache : protected pkgCache::Namespace { diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index a47b097b3..b6715294a 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -51,7 +51,7 @@ class pkgCacheGenerator // Flag file dependencies bool FoundFileDeps; - bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg); + bool NewPackage(pkgCache::PkgIterator &Pkg,const string &PkgName); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List); unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next); -- cgit v1.2.3 From ff6bf1be3844bcda15303efc81e234ede7501e3c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Jun 2007 18:20:45 +0200 Subject: * fix some warnings --- apt-pkg/contrib/configuration.cc | 5 +++-- apt-pkg/depcache.cc | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index c60ad3b0a..7914bd07b 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -422,6 +422,7 @@ bool Configuration::ExistsAny(const char *Name) const string key = Name; if (key.size() > 2 && key.end()[-2] == '/') + { if (key.find_first_of("fdbi",key.size()-1) < key.size()) { key.resize(key.size() - 2); @@ -432,7 +433,7 @@ bool Configuration::ExistsAny(const char *Name) const { _error->Warning(_("Unrecognized type abbreviation: '%c'"), key.end()[-3]); } - + } return Exists(Name); } /*}}}*/ @@ -506,7 +507,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, CurLine++; // This should be made to work instead, but this is better than looping if (F.fail() && !F.eof()) - return _error->Error(_("Line %d too long (max %d)"), CurLine, sizeof(Buffer)); + return _error->Error(_("Line %d too long (max %lu)"), CurLine, sizeof(Buffer)); _strtabexpand(Buffer,sizeof(Buffer)); _strstrip(Buffer); diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 5979f8379..50a75843f 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -216,7 +216,6 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); if(pkg.end() || pkg.VersionList().end()) continue; - bool oldAuto = section.FindI("Auto-Installed"); bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "Update exisiting AutoInstall info: " -- cgit v1.2.3