add a very simple testcase to ensure that the action modifiers are only

[apt.git] / apt-pkg / deb / debmetaindex.cc

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 8df3ed18d4399c1b15567dd80a2c6c01efa0932f..717d0bcdef3cdd5392af7b4e5009afb4524bf2a0 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -23,7 +23,7 @@ string debReleaseIndex::Info(const char *Type, string const &Section, string con
    else
    {
       Info += Dist + '/' + Section;
    else
    {
       Info += Dist + '/' + Section;

-      if (Arch.empty() == true)
+      if (Arch.empty() != true)

         Info += " " + Arch;
    }
    Info += " ";
         Info += " " + Arch;
    }
    Info += " ";


@@ -332,7 +332,12 @@ class debSLTypeDebian : public pkgSourceList::Type
            if (IsSrc == true)
               Deb->PushSectionEntry("source", new debReleaseIndex::debSectionEntry(Section, IsSrc));
            else
            if (IsSrc == true)
               Deb->PushSectionEntry("source", new debReleaseIndex::debSectionEntry(Section, IsSrc));
            else

-              Deb->PushSectionEntry(Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc));
+           {
+              if (Dist[Dist.size() - 1] == '/')
+                 Deb->PushSectionEntry("any", new debReleaseIndex::debSectionEntry(Section, IsSrc));
+              else
+                 Deb->PushSectionEntry(Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc));
+           }

            return true;
         }
       }
            return true;
         }
       }


@@ -342,7 +347,12 @@ class debSLTypeDebian : public pkgSourceList::Type
       if (IsSrc == true)
         Deb->PushSectionEntry ("source", new debReleaseIndex::debSectionEntry(Section, IsSrc));
       else
       if (IsSrc == true)
         Deb->PushSectionEntry ("source", new debReleaseIndex::debSectionEntry(Section, IsSrc));
       else

-        Deb->PushSectionEntry (Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc));
+      {
+        if (Dist[Dist.size() - 1] == '/')
+           Deb->PushSectionEntry ("any", new debReleaseIndex::debSectionEntry(Section, IsSrc));
+        else
+           Deb->PushSectionEntry (Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc));
+      }

       List.push_back(Deb);
       return true;
    }
       List.push_back(Deb);
       return true;
    }