projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix arguments for MarkInstall so packages are really marked as automatic
[apt.git]
/
apt-pkg
/
algorithms.h
diff --git
a/apt-pkg/algorithms.h
b/apt-pkg/algorithms.h
index b95218061903e4ea84d2b08445a41eee3878eaaf..582cbc527b1c9b4e7d252fae526318319118a0bb 100644
(file)
--- a/
apt-pkg/algorithms.h
+++ b/
apt-pkg/algorithms.h
@@
-30,18
+30,16
@@
#ifndef PKGLIB_ALGORITHMS_H
#define PKGLIB_ALGORITHMS_H
#ifndef PKGLIB_ALGORITHMS_H
#define PKGLIB_ALGORITHMS_H
-#ifdef __GNUG__
-#pragma interface "apt-pkg/algorithms.h"
-#endif
#include <apt-pkg/packagemanager.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/packagemanager.h>
#include <apt-pkg/depcache.h>
+#include <apt-pkg/acquire.h>
#include <iostream>
using std::ostream;
#include <iostream>
using std::ostream;
-class pkgSimulate : public pkgPackageManager
+class pkgSimulate : public pkgPackageManager
/*{{{*/
{
protected:
{
protected:
@@
-50,7
+48,7
@@
class pkgSimulate : public pkgPackageManager
pkgDepCache *Cache;
public:
pkgDepCache *Cache;
public:
- virtual VerIterator GetCandidateVer(PkgIterator Pkg)
+ virtual VerIterator GetCandidateVer(PkgIterator
const &
Pkg)
{
return (*Cache)[Pkg].CandidateVerIter(*Cache);
}
{
return (*Cache)[Pkg].CandidateVerIter(*Cache);
}
@@
-62,6
+60,7
@@
class pkgSimulate : public pkgPackageManager
Policy iPolicy;
pkgDepCache Sim;
Policy iPolicy;
pkgDepCache Sim;
+ pkgDepCache::ActionGroup group;
// The Actuall installation implementation
virtual bool Install(PkgIterator Pkg,string File);
// The Actuall installation implementation
virtual bool Install(PkgIterator Pkg,string File);
@@
-76,8
+75,8
@@
private:
pkgSimulate(pkgDepCache *Cache);
};
pkgSimulate(pkgDepCache *Cache);
};
-
-class pkgProblemResolver
+ /*}}}*/
+class pkgProblemResolver
/*{{{*/
{
pkgDepCache &Cache;
typedef pkgCache::PkgIterator PkgIterator;
{
pkgDepCache &Cache;
typedef pkgCache::PkgIterator PkgIterator;
@@
-106,10
+105,13
@@
class pkgProblemResolver
void MakeScores();
bool DoUpgrade(pkgCache::PkgIterator Pkg);
void MakeScores();
bool DoUpgrade(pkgCache::PkgIterator Pkg);
+
+ bool ResolveInternal(bool const BrokenFix = false);
+ bool ResolveByKeepInternal();
public:
public:
- inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected;};
+ 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 Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemove;};
inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
@@
-125,7
+127,7
@@
class pkgProblemResolver
pkgProblemResolver(pkgDepCache *Cache);
~pkgProblemResolver();
};
pkgProblemResolver(pkgDepCache *Cache);
~pkgProblemResolver();
};
-
+ /*}}}*/
bool pkgDistUpgrade(pkgDepCache &Cache);
bool pkgApplyStatus(pkgDepCache &Cache);
bool pkgFixBroken(pkgDepCache &Cache);
bool pkgDistUpgrade(pkgDepCache &Cache);
bool pkgApplyStatus(pkgDepCache &Cache);
bool pkgFixBroken(pkgDepCache &Cache);
@@
-133,5
+135,7
@@
bool pkgAllUpgrade(pkgDepCache &Cache);
bool pkgMinimizeUpgrade(pkgDepCache &Cache);
void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
bool pkgMinimizeUpgrade(pkgDepCache &Cache);
void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
+
+bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);
#endif
#endif