warning: unused parameter ‘foo’ [-Wunused-parameter]

[apt.git] / apt-pkg / sourcelist.cc

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index bbc514f5bbfea60be776b9e9502bde6f9de6089e..1f5179885627ab780a1e2b8a25ae9da619689133 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -20,6 +20,7 @@
 #include <apt-pkg/tagfile.h>
 
 #include <fstream>
 #include <apt-pkg/tagfile.h>
 
 #include <fstream>

+#include <algorithm>

 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/


@@ -91,7 +92,12 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
    };
    for (unsigned int j=0; j < sizeof(option_deb822)/sizeof(char*); j++)
       if (Tags.Exists(option_deb822[j]))
    };
    for (unsigned int j=0; j < sizeof(option_deb822)/sizeof(char*); j++)
       if (Tags.Exists(option_deb822[j]))

-         Options[option_internal[j]] = Tags.FindS(option_deb822[j]);
+      {
+         // for deb822 the " " is the delimiter, but the backend expects ","
+         std::string option = Tags.FindS(option_deb822[j]);
+         std::replace(option.begin(), option.end(), ' ', ',');
+         Options[option_internal[j]] = option;
+      }

    
    // now create one item per suite/section
    string Suite = Tags.FindS("Suites");
    
    // now create one item per suite/section
    string Suite = Tags.FindS("Suites");


@@ -297,7 +303,7 @@ bool pkgSourceList::Read(string File)
 /* */
 bool pkgSourceList::ReadAppend(string File)
 {
 /* */
 bool pkgSourceList::ReadAppend(string File)
 {

-   if (_config->FindB("APT::Sources::Use-Deb822", true) == true)
+   if (_config->FindB("APT::Sources::Use-Deb822", false) == true)

    {
       int lines_parsed =ParseFileDeb822(File);
       if (lines_parsed < 0)
    {
       int lines_parsed =ParseFileDeb822(File);
       if (lines_parsed < 0)