From eb1e6fc4973a844adbea0297c6425b00f64e8b7b Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 26 Apr 2022 21:33:16 +0200
Subject: Rewrite hidden config option checker for more patterns

The previous version allowed only foo::*::bar as a pattern, now you can
have as many starred parts as you want allowing for a finer control
instead of hardcoding specific common star-values or giving up with **.

It also adds a new INVALID type for an option to mark options which
should not be used, but are covered by a pattern which would normally
allow it.

Our tests are more or less the only users of this hidden feature making
this change not very risky even through it has no dedicated test itself.
---
 doc/examples/configure-index | 49 ++++++++++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 13 deletions(-)

(limited to 'doc/examples')

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 6723a48da..1b165702d 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -184,18 +184,16 @@ APT
      Error-Mode "<STRING>";
   };
 
-  /* define a new supported compressor on the fly
-  Compressor::rev {
-     Name "rev";
-     Extension ".reversed";
-     Binary "rev";
-     CompressArg {};
-     UncompressArg {};
-     Cost "10";
-  };
-  */
   Compressor "<LIST>";
-  Compressor::** "<UNDEFINED>";
+  // define a new compressor on the fly, like the super-compressor: /usr/bin/rev
+  Compressor::* {
+     Name "<STRING>"; // rev
+     Extension "<STRING>"; // .reversed
+     Binary "<STRING>"; // rev
+     CompressArg "<LIST>"; // {}
+     UncompressArg "<LIST>"; // {}
+     Cost "<INT>"; // 10
+  };
 
   Authentication
   {
@@ -584,6 +582,9 @@ Debug
   Acquire::Ftp "<BOOL>";    // Show ftp command traffic
   Acquire::Http "<BOOL>";   // Show http command traffic
   Acquire::Https "<BOOL>";   // Show https debug
+  Acquire::tor "<BOOL>";
+  Acquire::tor+http "<BOOL>";
+  Acquire::tor+https "<BOOL>";
   Acquire::gpgv "<BOOL>";   // Show the gpgv traffic
   Acquire::cdrom "<BOOL>";   // Show cdrom debug output
   Acquire::Transaction "<BOOL>";
@@ -819,10 +820,31 @@ acquire::max-pipeline-depth "<INT>";
 acquire::progress::diffpercent "<BOOL>";
 acquire::gzipindexes "<BOOL>";
 acquire::indextargets::randomized "<BOOL>";
-acquire::indextargets::deb::** "<UNDEFINED>";
-acquire::indextargets::deb-src::** "<UNDEFINED>";
+acquire::indextargets::* "<LIST>" {
+	* {
+		MetaKey "<STRING>";
+		ShortDescription "<STRING>";
+		Description "<STRING>";
+		flatMetaKey "<STRING>";
+		flatDescription "<STRING>";
+		Identifier "<STRING>";
+		DefaultEnabled "<BOOL>";
+		Optional "<BOOL>";
+		KeepCompressed "<BOOL>";
+		PDiffs "<BOOL>";
+		By-Hash "<STRING>";
+		Fallback-Of "<STRING>";
+		CompressionTypes "<STRING>";
+		KeepCompressedAs "<STRING>";
+	};
+};
 acquire::progress::ignore::showerrortext "<BOOL>";
 acquire::*::dl-limit "<INT>"; // catches file: and co which do not have these
+acquire::file::dl-limit "<INVALID>";
+acquire::copy::dl-limit "<INVALID>";
+acquire::gpgv::dl-limit "<INVALID>";
+acquire::store::dl-limit "<INVALID>";
+acquire::mirror::dl-limit "<INVALID>";
 methods::mirror::problemreporting "<STRING>";
 acquire::http::proxyautodetect "<STRING>";
 acquire::http::proxy-auto-detect "<STRING>";
@@ -900,6 +922,7 @@ APT::Internal::OpProgress::EraseLines "<BOOL>";
 APT::Color "<BOOL>";
 APT::Color::Show::Field "<STRING>";
 APT::Color::Show::Package "<STRING>";
+APT::Color::* "<STRING>";
 
 update-manager::always-include-phased-updates "<BOOL>";
 update-manager::never-include-phased-updates "<BOOL>";
-- 
cgit v1.2.3-70-g09d2