projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: remove SHA1 support testing as unsupported
[apt.git]
/
apt-pkg
/
algorithms.h
diff --git
a/apt-pkg/algorithms.h
b/apt-pkg/algorithms.h
index 7f58c8eedb12ce281d8af8df120eeda3be6d3013..5b0d8fb2997ed29c01c85976517c0bbfaa0a20bf 100644
(file)
--- a/
apt-pkg/algorithms.h
+++ b/
apt-pkg/algorithms.h
@@
-1,6
+1,5
@@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: algorithms.h,v 1.10 2001/05/22 04:17:41 jgg Exp $
/* ######################################################################
Algorithms - A set of misc algorithms
/* ######################################################################
Algorithms - A set of misc algorithms
@@
-10,7
+9,7
@@
see all of the effects of an upgrade run.
pkgDistUpgrade computes an upgrade that causes as many packages as
see all of the effects of an upgrade run.
pkgDistUpgrade computes an upgrade that causes as many packages as
- possible to move to the newest ver
is
on.
+ possible to move to the newest ver
si
on.
pkgApplyStatus sets the target state based on the content of the status
field in the status file. It is important to get proper crash recovery.
pkgApplyStatus sets the target state based on the content of the status
field in the status file. It is important to get proper crash recovery.
@@
-33,8
+32,11
@@
#include <apt-pkg/packagemanager.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/packagemanager.h>
#include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
#include <iostream>
#include <iostream>
+#include <string>
#include <apt-pkg/macros.h>
#include <apt-pkg/macros.h>
@@
-43,10
+45,16
@@
using std::ostream;
#endif
using std::ostream;
#endif
-class pkgAcquireStatus;
+#ifndef APT_9_CLEANER_HEADERS
+// include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatibility
+#include <apt-pkg/upgrade.h>
+#include <apt-pkg/update.h>
+#endif
+
class pkgSimulate : public pkgPackageManager /*{{{*/
{
class pkgSimulate : public pkgPackageManager /*{{{*/
{
+ void * const d;
protected:
class Policy : public pkgDepCache::Policy
protected:
class Policy : public pkgDepCache::Policy
@@
-54,12
+62,12
@@
class pkgSimulate : public pkgPackageManager /*{{{*/
pkgDepCache *Cache;
public:
pkgDepCache *Cache;
public:
- virtual VerIterator GetCandidateVer(PkgIterator const &Pkg)
+ virtual VerIterator GetCandidateVer(PkgIterator const &Pkg)
APT_OVERRIDE
{
return (*Cache)[Pkg].CandidateVerIter(*Cache);
}
{
return (*Cache)[Pkg].CandidateVerIter(*Cache);
}
- Policy(pkgDepCache *Cache) : Cache(Cache) {};
+
explicit
Policy(pkgDepCache *Cache) : Cache(Cache) {};
};
unsigned char *Flags;
};
unsigned char *Flags;
@@
-67,26
+75,27
@@
class pkgSimulate : public pkgPackageManager /*{{{*/
Policy iPolicy;
pkgDepCache Sim;
pkgDepCache::ActionGroup group;
Policy iPolicy;
pkgDepCache Sim;
pkgDepCache::ActionGroup group;
-
- // The Actual
l
installation implementation
- virtual bool Install(PkgIterator Pkg,std::string File);
- virtual bool Configure(PkgIterator Pkg);
- virtual bool Remove(PkgIterator Pkg,bool Purge);
+
+ // The Actual installation implementation
+ virtual bool Install(PkgIterator Pkg,std::string File)
APT_OVERRIDE
;
+ virtual bool Configure(PkgIterator Pkg)
APT_OVERRIDE
;
+ virtual bool Remove(PkgIterator Pkg,bool Purge)
APT_OVERRIDE
;
private:
private:
- void ShortBreaks();
- void Describe(PkgIterator iPkg,std::ostream &out,bool Current,bool Candidate);
-
+
APT_HIDDEN
void ShortBreaks();
+
APT_HIDDEN
void Describe(PkgIterator iPkg,std::ostream &out,bool Current,bool Candidate);
+
public:
public:
- pkgSimulate(pkgDepCache *Cache);
- ~pkgSimulate();
+
explicit
pkgSimulate(pkgDepCache *Cache);
+
virtual
~pkgSimulate();
};
/*}}}*/
class pkgProblemResolver /*{{{*/
{
};
/*}}}*/
class pkgProblemResolver /*{{{*/
{
+ private:
/** \brief dpointer placeholder (for later in case we need it) */
/** \brief dpointer placeholder (for later in case we need it) */
- void *d;
+ void *
const
d;
pkgDepCache &Cache;
typedef pkgCache::PkgIterator PkgIterator;
pkgDepCache &Cache;
typedef pkgCache::PkgIterator PkgIterator;
@@
-104,8
+113,7
@@
class pkgProblemResolver /*{{{*/
bool Debug;
// Sort stuff
bool Debug;
// Sort stuff
- static pkgProblemResolver *This;
- static int ScoreSort(const void *a,const void *b);
+ APT_HIDDEN int ScoreSort(Package const *A, Package const *B) APT_PURE;
struct PackageKill
{
struct PackageKill
{
@@
-113,12
+121,12
@@
class pkgProblemResolver /*{{{*/
DepIterator Dep;
};
DepIterator Dep;
};
- void MakeScores();
- bool DoUpgrade(pkgCache::PkgIterator Pkg);
+ APT_HIDDEN void MakeScores();
+ APT_HIDDEN bool DoUpgrade(pkgCache::PkgIterator Pkg);
+
+ APT_HIDDEN bool ResolveInternal(bool const BrokenFix = false);
+ APT_HIDDEN bool ResolveByKeepInternal();
- bool ResolveInternal(bool const BrokenFix = false);
- bool ResolveByKeepInternal();
-
protected:
bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
protected:
bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
@@
-127,29
+135,23
@@
class pkgProblemResolver /*{{{*/
inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected; Cache.MarkProtected(Pkg);};
inline void Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemove;};
inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected; Cache.MarkProtected(Pkg);};
inline void Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemove;};
inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
-
- // Try to intelligently resolve problems by installing and removing packages
- bool Resolve(bool BrokenFix = false);
-
+
+ // Try to intelligently resolve problems by installing and removing packages
+ bool Resolve(bool BrokenFix = false
, OpProgress * const Progress = NULL
);
+
// Try to resolve problems only by using keep
// Try to resolve problems only by using keep
- bool ResolveByKeep();
+ bool ResolveByKeep(
OpProgress * const Progress = NULL
);
-
__deprecated
void InstallProtect();
+
APT_DEPRECATED_MSG("NOOP as MarkInstall enforces not overriding FromUser markings")
void InstallProtect();
- pkgProblemResolver(pkgDepCache *Cache);
- ~pkgProblemResolver();
+
explicit
pkgProblemResolver(pkgDepCache *Cache);
+
virtual
~pkgProblemResolver();
};
/*}}}*/
};
/*}}}*/
-bool pkgDistUpgrade(pkgDepCache &Cache);
bool pkgApplyStatus(pkgDepCache &Cache);
bool pkgFixBroken(pkgDepCache &Cache);
bool pkgApplyStatus(pkgDepCache &Cache);
bool pkgFixBroken(pkgDepCache &Cache);
-bool pkgAllUpgrade(pkgDepCache &Cache);
-bool pkgMinimizeUpgrade(pkgDepCache &Cache);
void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
-bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);
-bool AcquireUpdate(pkgAcquire &Fetcher, int const PulseInterval = 0,
- bool const RunUpdateScripts = true, bool const ListCleanup = true);
#endif
#endif