refactor

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 5f04135d267b1511d34b89ce9d69e1766bd45e3d..c38fd2d314604a4feb22d4b56283f0f0883dd997 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -135,14 +135,15 @@ bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache,
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

+

 // FIXME: move into more generic code (metaindex ?)
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
 // FIXME: move into more generic code (metaindex ?)
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)

-std::string MetaIndexFileName(metaIndex *metaindex)
+std::string MetaIndexFileNameOnDisk(metaIndex *metaindex)

 {
    // FIXME: this cast is the horror, the horror
    debReleaseIndex *r = (debReleaseIndex*)metaindex;
 #else
 {
    // FIXME: this cast is the horror, the horror
    debReleaseIndex *r = (debReleaseIndex*)metaindex;
 #else

-std::string MetaIndexFileName(metaIndex *r)
+std::string MetaIndexFileNameOnDisk(metaIndex *r)

 {
 #endif
 
 {
 #endif
 


@@ -152,14 +153,22 @@ std::string MetaIndexFileName(metaIndex *r)
       return PathInRelease;
 
    // and if not return the normal one
       return PathInRelease;
 
    // and if not return the normal one

-   return r->MetaIndexFile("Release");
+   if (FileExists(PathInRelease))
+      return r->MetaIndexFile("Release");
+
+   return "";

 }
 
 }
 

+
+// GetReleaseForSourceRecord - Return Suite for the given srcrecord    /*{{{*/
+// ---------------------------------------------------------------------
+/* */

 std::string GetReleaseForSourceRecord(pkgSourceList *SrcList,
                                       pkgSrcRecords::Parser *Parse)
 {
    // try to find release
 std::string GetReleaseForSourceRecord(pkgSourceList *SrcList,
                                       pkgSrcRecords::Parser *Parse)
 {
    // try to find release

-   const pkgIndexFile& SI = Parse->Index();
+   const pkgIndexFile& CurrentIndexFile = Parse->Index();
+

    for (pkgSourceList::const_iterator S = SrcList->begin(); 
         S != SrcList->end(); ++S)
    {
    for (pkgSourceList::const_iterator S = SrcList->begin(); 
         S != SrcList->end(); ++S)
    {


@@ -167,19 +176,21 @@ std::string GetReleaseForSourceRecord(pkgSourceList *SrcList,
       for (vector<pkgIndexFile *>::const_iterator IF = Indexes->begin();
            IF != Indexes->end(); ++IF)
       {
       for (vector<pkgIndexFile *>::const_iterator IF = Indexes->begin();
            IF != Indexes->end(); ++IF)
       {

-         if (&SI == (*IF))
+         if (&CurrentIndexFile == (*IF))

          {
          {

-            std::string path = MetaIndexFileName(*S);
-            indexRecords records;
-            records.Load(path);
-            return records.GetSuite();
+            std::string path = MetaIndexFileNameOnDisk(*S);
+            if (path != "") 
+            {
+               indexRecords records;
+               records.Load(path);
+               return records.GetSuite();
+            }

          }
       }
    }
    return "";
 }
          }
       }
    }
    return "";
 }

-
-
+                                                                       /*}}}*/

 // FindSrc - Find a source record                                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // FindSrc - Find a source record                                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */