Browse Source

add support for Enabled: no in deb822 sources.list

debian/1.8.y
Michael Vogt 9 years ago
parent
commit
7dd62ea934
  1. 4
      apt-pkg/sourcelist.cc
  2. 5
      doc/sources.list.5.xml
  3. 4
      test/integration/test-apt-sources-deb822

4
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;
}
string Enabled = Tags.FindS("Enabled");
if (Enabled.size() > 0 && StringToBool(Enabled) == false)
return true;
// Define external/internal options
const char* option_deb822[] = {

5
doc/sources.list.5.xml

@ -85,7 +85,7 @@
<literallayout>
Type: deb
URI: http://example.com
Suites: stable
Suites: stable testing
Sections: component1 component2
Description: short
long long long
@ -95,9 +95,10 @@
URI: http://example.com
Suites: stable
Sections: component1 component2
[option1]: [option1-value]
Enabled: no
Description: short
long long long
[option1]: [option1-value]
</literallayout>
</para>

4
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
# with Enabled: false
echo "$BASE" > $SOURCES
echo "Enabled: no" >> $SOURCES
testempty aptget update --print-uris

Loading…
Cancel
Save