HCoop
/
ntk
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Chinese (simplified) program translation update
[ntk/apt.git]
/
apt-pkg
/
algorithms.h
diff --git
a/apt-pkg/algorithms.h
b/apt-pkg/algorithms.h
index
a499db8
..
f35bd9a
100644
(file)
--- a/
apt-pkg/algorithms.h
+++ b/
apt-pkg/algorithms.h
@@
-10,7
+10,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
+33,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,7
+46,12
@@
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 /*{{{*/
{
@@
-85,6
+93,7
@@
private:
/*}}}*/
class pkgProblemResolver /*{{{*/
{
/*}}}*/
class pkgProblemResolver /*{{{*/
{
+ private:
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
@@
-105,7
+114,7
@@
class pkgProblemResolver /*{{{*/
// Sort stuff
static pkgProblemResolver *This;
// Sort stuff
static pkgProblemResolver *This;
- static int ScoreSort(const void *a,const void *b);
+ static int ScoreSort(const void *a,const void *b)
APT_PURE
;
struct PackageKill
{
struct PackageKill
{
@@
-134,26
+143,16
@@
class pkgProblemResolver /*{{{*/
// Try to resolve problems only by using keep
bool ResolveByKeep();
// Try to resolve problems only by using keep
bool ResolveByKeep();
-
__deprecated
void InstallProtect();
+
APT_DEPRECATED
void InstallProtect();
pkgProblemResolver(pkgDepCache *Cache);
~pkgProblemResolver();
};
/*}}}*/
pkgProblemResolver(pkgDepCache *Cache);
~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 pkgAllUpgradeNoDelete(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