test-indexes.sh: Add source related tests, which uncovers two regressions

[apt.git] / ftparchive / writer.h

diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index ad58dee0aae7b76b5337ee2ff77d50036df174b7..af7ba4edd5ceda709ee96ebc7143839970e2cd12 100644 (file)
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -34,8 +34,8 @@ class FTWScanner
 {
    protected:
    vector<string> Patterns;
 {
    protected:
    vector<string> Patterns;

+   string Arch;

    const char *OriginalPath;
    const char *OriginalPath;

-   char *RealPath;

    bool ErrorPrinted;
    
    // Stuff for the delinker
    bool ErrorPrinted;
    
    // Stuff for the delinker


@@ -69,8 +69,7 @@ class FTWScanner
    void AddPattern(string const &Pattern) { Patterns.push_back(Pattern); };
    bool SetExts(string const &Vals);
       
    void AddPattern(string const &Pattern) { Patterns.push_back(Pattern); };
    bool SetExts(string const &Vals);
       

-   FTWScanner();
-   virtual ~FTWScanner() {delete [] RealPath;};
+   FTWScanner(string const &Arch = string());

 };
 
 class PackagesWriter : public FTWScanner
 };
 
 class PackagesWriter : public FTWScanner


@@ -94,7 +93,6 @@ class PackagesWriter : public FTWScanner
    string DirStrip;
    FILE *Output;
    struct CacheDB::Stats &Stats;
    string DirStrip;
    FILE *Output;
    struct CacheDB::Stats &Stats;

-   string Arch;

 
    inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);};
    inline bool ReadExtraOverride(string const &File) 
 
    inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);};
    inline bool ReadExtraOverride(string const &File) 


@@ -127,7 +125,7 @@ class ContentsWriter : public FTWScanner
    void Finish() {Gen.Print(Output);};
    inline bool ReadyDB(string const &DB) {return Db.ReadyDB(DB);};
    
    void Finish() {Gen.Print(Output);};
    inline bool ReadyDB(string const &DB) {return Db.ReadyDB(DB);};
    

-   ContentsWriter(string const &DB);
+   ContentsWriter(string const &DB, string const &Arch = string());

    virtual ~ContentsWriter() {};
 };
 
    virtual ~ContentsWriter() {};
 };