populate the Architecture field for PackageFiles

[apt.git] / apt-pkg / edsp / edspindexfile.cc

diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index e013dd44c2502996c4da149afe029bf8ea5a84fc..a2ec0a19bfcc4d2bdcea412ae7df6af3e54390ab 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -49,15 +49,14 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 
    if (Prog != NULL)
       Prog->SubProgress(0,File);
 
    if (Prog != NULL)
       Prog->SubProgress(0,File);

-   if (Gen.SelectFile(File,std::string(),*this) == false)
+   if (Gen.SelectFile(File, *this, "", "edsp") == false)

       return _error->Error("Problem with SelectFile %s",File.c_str());
 
    // Store the IMS information
    pkgCache::PkgFileIterator CFile = Gen.GetCurFile();
       return _error->Error("Problem with SelectFile %s",File.c_str());
 
    // Store the IMS information
    pkgCache::PkgFileIterator CFile = Gen.GetCurFile();

+   pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator> DynFile(CFile);

    CFile->Size = Pkg.FileSize();
    CFile->mtime = Pkg.ModificationTime();
    CFile->Size = Pkg.FileSize();
    CFile->mtime = Pkg.ModificationTime();

-   map_stringitem_t const storage = Gen.WriteUniqString("edsp::scenario");
-   CFile->Archive = storage;

 
    if (Gen.MergeList(Parser) == false)
       return _error->Error("Problem with MergeList %s",File.c_str());
 
    if (Gen.MergeList(Parser) == false)
       return _error->Error("Problem with MergeList %s",File.c_str());


@@ -65,7 +64,7 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 }
                                                                        /*}}}*/
 // Index File types for APT                                            /*{{{*/
 }
                                                                        /*}}}*/
 // Index File types for APT                                            /*{{{*/

-class edspIFType: public pkgIndexFile::Type
+class APT_HIDDEN edspIFType: public pkgIndexFile::Type

 {
    public:
    virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator) const
 {
    public:
    virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator) const


@@ -75,7 +74,7 @@ class edspIFType: public pkgIndexFile::Type
    };
    edspIFType() {Label = "EDSP scenario file";};
 };
    };
    edspIFType() {Label = "EDSP scenario file";};
 };

-static edspIFType _apt_Universe;
+APT_HIDDEN edspIFType _apt_Universe;

 
 const pkgIndexFile::Type *edspIndex::GetType() const
 {
 
 const pkgIndexFile::Type *edspIndex::GetType() const
 {