add support for Enabled: no in deb822 sources.list

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 4e580ba04f97a515396d9581505fe14366ebf7d8..5d41fb00eeeeed71d544ac143260e52b615c165b 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -84,6 +84,10 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
       _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());
       return false;
    }
       _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());
       return false;
    }

+
+   string Enabled = Tags.FindS("Enabled");
+   if (Enabled.size() > 0 && StringToBool(Enabled) == false)
+      return true;

    
    // Define external/internal options
    const char* option_deb822[] = { 
    
    // Define external/internal options
    const char* option_deb822[] = { 

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index b2b682292242cf2b40cf7ad277ceb93363eeb187..a2f6e985eb8dfac45e855368bd8529ceeb256c88 100644 (file)
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -85,7 +85,7 @@
    <literallayout>
      Type: deb
      URI: http://example.com
    <literallayout>
      Type: deb
      URI: http://example.com

-     Suites: stable
+     Suites: stable testing

      Sections: component1 component2
      Description: short
       long long long
      Sections: component1 component2
      Description: short
       long long long


@@ -95,9 +95,10 @@
      URI: http://example.com
      Suites: stable
      Sections: component1 component2
      URI: http://example.com
      Suites: stable
      Sections: component1 component2

-     [option1]: [option1-value]
+     Enabled: no

      Description: short
       long long long
      Description: short
       long long long

+     [option1]: [option1-value]

    </literallayout>
    </para>
 
    </literallayout>
    </para>
 

diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822
index 34708d2d166ec2f22a0b25873175c47bfd5eb33d..f461314e6ef7952f810e1ad95959225ec90ff7ba 100755 (executable)
--- a/test/integration/test-apt-sources-deb822
+++ b/test/integration/test-apt-sources-deb822
@@ -75,3 +75,7 @@ Suites: stable
 testequalwithmsg "Invalid deb822 sources.list file gives proper error" "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse)
 E: The list of sources could not be read."  aptget update --print-uris
 
 testequalwithmsg "Invalid deb822 sources.list file gives proper error" "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse)
 E: The list of sources could not be read."  aptget update --print-uris
 

+# with Enabled: false
+echo "$BASE"  > $SOURCES
+echo "Enabled: no" >> $SOURCES
+testempty aptget update --print-uris