Browse Source

use a abi version check similar to the gcc check

Git-Dch: Ignore
debian/1.8.y
David Kalnischkies 8 years ago
parent
commit
ccf6bdb3ef
  1. 1
      apt-pkg/contrib/macros.h
  2. 2
      apt-pkg/deb/deblistparser.cc
  3. 2
      apt-pkg/deb/deblistparser.h
  4. 2
      apt-pkg/deb/debmetaindex.cc
  5. 2
      apt-pkg/deb/debmetaindex.h
  6. 4
      apt-pkg/metaindex.h
  7. 6
      apt-pkg/packagemanager.cc
  8. 12
      apt-pkg/packagemanager.h
  9. 2
      apt-pkg/pkgcachegen.h
  10. 6
      apt-private/private-install.cc

1
apt-pkg/contrib/macros.h

@ -156,5 +156,6 @@
#define APT_PKG_MAJOR 4
#define APT_PKG_MINOR 15
#define APT_PKG_RELEASE 0
#define APT_PKG_ABI ((APT_PKG_MAJOR * 100) + APT_PKG_MINOR)
#endif

2
apt-pkg/deb/deblistparser.cc

@ -992,7 +992,7 @@ unsigned char debListParser::GetPrio(string Str)
return Out;
}
/*}}}*/
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 413
bool debListParser::SameVersion(unsigned short const Hash, /*{{{*/
pkgCache::VerIterator const &Ver)
{

2
apt-pkg/deb/deblistparser.h

@ -71,7 +71,7 @@ class debListParser : public pkgCacheGenerator::ListParser
virtual std::vector<std::string> AvailableDescriptionLanguages();
virtual MD5SumValue Description_md5();
virtual unsigned short VersionHash();
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 413
virtual bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);
#endif
virtual bool UsePackage(pkgCache::PkgIterator &Pkg,

2
apt-pkg/deb/debmetaindex.cc

@ -78,7 +78,7 @@ string debReleaseIndex::MetaIndexURI(const char *Type) const
return Res;
}
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 0x0413
std::string debReleaseIndex::LocalFileName() const
{
// see if we have a InRelease file

2
apt-pkg/deb/debmetaindex.h

@ -53,7 +53,7 @@ class debReleaseIndex : public metaIndex {
std::string MetaIndexFile(const char *Types) const;
std::string MetaIndexURI(const char *Type) const;
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 413
virtual std::string LocalFileName() const;
#endif

4
apt-pkg/metaindex.h

@ -40,9 +40,11 @@ class metaIndex
virtual const char* GetType() const {return Type;}
// interface to to query it
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 413
// returns the path of the local file (or "" if its not available)
virtual std::string LocalFileName() const {return "";};
#else
std::string LocalFileName() const;
#endif
// Interface for acquire

6
apt-pkg/packagemanager.cc

@ -1059,7 +1059,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
// PM::DoInstallPostFork - compat /*{{{*/
// ---------------------------------------------------------------------
/*}}}*/
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 413
pkgPackageManager::OrderResult
pkgPackageManager::DoInstallPostFork(int statusFd)
{
@ -1096,7 +1096,7 @@ pkgPackageManager::DoInstallPostFork(int statusFd)
// PM::DoInstall - Does the installation /*{{{*/
// ---------------------------------------------------------------------
/* compat */
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 413
pkgPackageManager::OrderResult
pkgPackageManager::DoInstall(int statusFd)
{
@ -1120,7 +1120,7 @@ pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd)
// ---------------------------------------------------------------------
/* This uses the filenames in FileNames and the information in the
DepCache to perform the installation of packages.*/
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 413
pkgPackageManager::OrderResult
pkgPackageManager::DoInstall(APT::Progress::PackageManager *progress)
{

12
apt-pkg/packagemanager.h

@ -96,12 +96,10 @@ class pkgPackageManager : protected pkgCache::Namespace
virtual bool Install(PkgIterator /*Pkg*/,std::string /*File*/) {return false;};
virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 413
virtual bool Go(APT::Progress::PackageManager * /*progress*/) {return true;};
virtual bool Go(int /*statusFd*/=-1) {return true;};
#else
virtual bool Go(int /*statusFd*/=-1) {return true;};
#endif
virtual bool Go(int /*statusFd*/=-1) {return true;};
virtual void Reset() {};
@ -114,8 +112,8 @@ class pkgPackageManager : protected pkgCache::Namespace
bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
pkgRecords *Recs);
// Do the installation
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
// Do the installation
#if APT_PKG_ABI >= 413
OrderResult DoInstall(APT::Progress::PackageManager *progress);
// compat
APT_DEPRECATED OrderResult DoInstall(int statusFd=-1);
@ -129,7 +127,7 @@ class pkgPackageManager : protected pkgCache::Namespace
Res = OrderInstall();
return Res;
};
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 413
// stuff that needs to be done after the fork
OrderResult DoInstallPostFork(APT::Progress::PackageManager *progress);
// compat

2
apt-pkg/pkgcachegen.h

@ -178,7 +178,7 @@ class pkgCacheGenerator::ListParser
* \param Hash of the currently parsed version
* \param Ver to compare with
*/
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 413
virtual
#endif
APT_PURE bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);

6
apt-private/private-install.cc

@ -94,7 +94,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety)
{
pkgSimulate PM(Cache);
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 413
APT::Progress::PackageManager *progress = APT::Progress::PackageManagerProgressFactory();
pkgPackageManager::OrderResult Res = PM.DoInstall(progress);
delete progress;
@ -306,8 +306,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety)
}
_system->UnLock();
#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
#if APT_PKG_ABI >= 413
APT::Progress::PackageManager *progress = APT::Progress::PackageManagerProgressFactory();
pkgPackageManager::OrderResult Res = PM->DoInstall(progress);
delete progress;

Loading…
Cancel
Save