projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Swedish translation update. Closes: #592366
[apt.git]
/
apt-pkg
/
acquire-method.h
diff --git
a/apt-pkg/acquire-method.h
b/apt-pkg/acquire-method.h
index 4f08a43ae85d460e4ea7c58b81bed379ce9f1e03..03851e8239657451abab188a9f883282395e2bab 100644
(file)
--- a/
apt-pkg/acquire-method.h
+++ b/
apt-pkg/acquire-method.h
@@
-23,9
+23,6
@@
#include <apt-pkg/configuration.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/strutl.h>
-#ifdef __GNUG__
-#pragma interface "apt-pkg/acquire-method.h"
-#endif
class Hashes;
class pkgAcqMethod
class Hashes;
class pkgAcqMethod
@@
-40,12
+37,14
@@
class pkgAcqMethod
string DestFile;
time_t LastModified;
bool IndexFile;
string DestFile;
time_t LastModified;
bool IndexFile;
+ bool FailIgnore;
};
struct FetchResult
{
string MD5Sum;
string SHA1Sum;
};
struct FetchResult
{
string MD5Sum;
string SHA1Sum;
+ string SHA256Sum;
vector<string> GPGVOutput;
time_t LastModified;
bool IMSHit;
vector<string> GPGVOutput;
time_t LastModified;
bool IMSHit;
@@
-61,7
+60,9
@@
class pkgAcqMethod
vector<string> Messages;
FetchItem *Queue;
FetchItem *QueueBack;
vector<string> Messages;
FetchItem *Queue;
FetchItem *QueueBack;
- string FailExtra;
+ string FailReason;
+ string UsedMirror;
+ string IP;
// Handlers for messages
virtual bool Configuration(string Message);
// Handlers for messages
virtual bool Configuration(string Message);
@@
-70,14
+71,14
@@
class pkgAcqMethod
// Outgoing messages
void Fail(bool Transient = false);
inline void Fail(const char *Why, bool Transient = false) {Fail(string(Why),Transient);};
// Outgoing messages
void Fail(bool Transient = false);
inline void Fail(const char *Why, bool Transient = false) {Fail(string(Why),Transient);};
- void Fail(string Why, bool Transient = false);
- void URIStart(FetchResult &Res);
- void URIDone(FetchResult &Res,FetchResult *Alt = 0);
+ virtual void Fail(string Why, bool Transient = false);
+ virtual void URIStart(FetchResult &Res);
+ virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
+
bool MediaFail(string Required,string Drive);
virtual void Exit() {};
public:
bool MediaFail(string Required,string Drive);
virtual void Exit() {};
public:
-
enum CnfFlags {SingleInstance = (1<<0),
Pipeline = (1<<1), SendConfig = (1<<2),
LocalOnly = (1<<3), NeedsCleanup = (1<<4),
enum CnfFlags {SingleInstance = (1<<0),
Pipeline = (1<<1), SendConfig = (1<<2),
LocalOnly = (1<<3), NeedsCleanup = (1<<4),
@@
-86,8
+87,11
@@
class pkgAcqMethod
void Log(const char *Format,...);
void Status(const char *Format,...);
void Log(const char *Format,...);
void Status(const char *Format,...);
+ void Redirect(const string &NewURI);
+
int Run(bool Single = false);
int Run(bool Single = false);
- inline void SetFailExtraMsg(string Msg) {FailExtra = Msg;};
+ inline void SetFailReason(string Msg) {FailReason = Msg;};
+ inline void SetIP(string aIP) {IP = aIP;};
pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
virtual ~pkgAcqMethod() {};
pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
virtual ~pkgAcqMethod() {};