diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-06-28 12:31:17 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-06-28 12:31:17 +0000 |
| commit | 254ce4b0cc0336de5a9b46c693673ef68d5628b6 (patch) | |
| tree | 180d7b122cc5ab1b8a9625ed873f83e7fdb104f4 /ftparchive/writer.h | |
| parent | be65f52793235fa0419af5bb6c867da28506c227 (diff) | |
| parent | 29ba053e05b1a496500036dbd667002d1b8b5ec2 (diff) | |
* merged with apt--ubuntu--0
Patches applied:
* apt@packages.debian.org/apt--ubuntu--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-88
* apt@packages.debian.org/apt--ubuntu--0--patch-1
Merge from Debian branch
* apt@packages.debian.org/apt--ubuntu--0--patch-2
0.6.38ubuntu1
* apt@packages.debian.org/apt--ubuntu--0--patch-3
Merge with mainline
* apt@packages.debian.org/apt--ubuntu--0--patch-4
Improved arch-build rule
* apt@packages.debian.org/apt--ubuntu--0--patch-5
Merge with mainline
* apt@packages.debian.org/apt--ubuntu--0--patch-6
Merge with mvo
* michael.vogt@ubuntu.com--2005/apt--bts225947--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-79
* michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-1
* merged with mainline and apt--fixes--0
* michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-2
* patch from aj (slighly modified to use auto_ptr<>) applied
* michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-3
* changelog updated
* michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-4
* work for arch=all packages too now
* michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-87
* michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-1
* report timeouts (from Connect) and fail if they happen in pkgAcqMetaSig
* michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-2
* merged with the fixes branch to make it build again
* michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-1
tag of apt@packages.debian.org/apt--main--0--patch-88
* michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-2
* merged apt--mvo (to make pining on components work again)
* michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-3
* merged with apt--fixes--0 (to make the building of the french manpages work and to fix a incorrect man-page example
* michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-4
* merged with the bts225947 code
* michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-5
* merged the imporoved timoeut handling patch
* michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-6
* merged with matt
* michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-7
* removed another conflict with apt--main
Diffstat (limited to 'ftparchive/writer.h')
| -rw-r--r-- | ftparchive/writer.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ftparchive/writer.h b/ftparchive/writer.h index ce4c947a9..16d014ef8 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -92,13 +92,15 @@ class PackagesWriter : public FTWScanner string DirStrip; FILE *Output; struct CacheDB::Stats &Stats; - + string Arch; + inline bool ReadOverride(string File) {return Over.ReadOverride(File);}; inline bool ReadExtraOverride(string File) {return Over.ReadExtraOverride(File);}; virtual bool DoPackage(string FileName); - PackagesWriter(string DB,string Overrides,string ExtOverrides=string()); + PackagesWriter(string DB,string Overrides,string ExtOverrides=string(), + string Arch=string()); virtual ~PackagesWriter() {}; }; @@ -170,6 +172,7 @@ protected: string SHA1; // Limited by FileFd::Size() unsigned long size; + ~CheckSum() {}; }; map<string,struct CheckSum> CheckSums; }; |