[gentoo-commits] data/glep:glep-manifest commit in: /

["Michał Górny" <mgorny@gentoo.org>]

commit:     75bbb25e8db29a3d09b7da57f3b9fd9bddd79e11
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 18:19:35 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov  2 19:09:17 2017 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=75bbb25e

glep-0074: Remove OPTIONAL

 glep-0074.rst | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/glep-0074.rst b/glep-0074.rst
index b7b5a8c..f256451 100644
--- a/glep-0074.rst
+++ b/glep-0074.rst
@@ -148,13 +148,7 @@ used:
 
    c. otherwise, the verification succeeds.
 
-3. If the file is covered by an entry of the ``OPTIONAL`` type:
-
-   a. if the file is present, then the verification fails,
-
-   b. otherwise, the verification succeeds.
-
-4. If the file is present but not listed in Manifest, the verification
+3. If the file is present but not listed in Manifest, the verification
    fails.
 
 Unless specified otherwise, the package manager must not allow using
@@ -221,13 +215,6 @@ The Manifest files can specify the following tags:
   in non-strict mode. Used for files that do not affect the installed
   packages (``metadata.xml``, ``use.desc``).
 
-``OPTIONAL <path>``
-  Specifies a file that does not exist in the distribution but if it
-  did, it would be marked as ``MISC``. In the strict mode, the file
-  must not exist for the verification to pass. The package manager
-  may ignore a stray file matching this entry if operating in non-strict
-  mode.
-
 ``DIST <filename> <size> <checksums>…``
   Specifies a distfile entry used to verify files fetched as part
   of ``SRC_URI``. The filename must match the filename used to store
@@ -272,8 +259,8 @@ can be used:
 4. Process all ``IGNORE`` entries. Remove any paths matching them
    from the *present* set.
 
-5. Collect all files covered by ``DATA``, ``MISC``, ``OPTIONAL``,
-   ``EBUILD`` and ``AUX`` entries into the *covered* set.
+5. Collect all files covered by ``DATA``, ``MISC``, ``EBUILD``
+   and ``AUX`` entries into the *covered* set.
 
 6. Verify the entries in *covered* set for incompatible duplicates
    and collisions with ignored files as explained in `Manifest file
@@ -550,12 +537,6 @@ It aims to account for two use cases:
 2. Accounting for automatically generated files that might be updated
    by standard tooling.
 
-The traditional ``MISC`` type is amended with a complementary
-``OPTIONAL`` tag to account for files that are not provided
-in the specific repository. It aims to ensure that the same path would
-be non-fatal when provided by the repository but fatal when created
-by the user tooling.
-
 
 Timestamp field
 ---------------
@@ -643,9 +624,7 @@ on providing them via an additional rsync module.
 
 If such files were injected into the repository, they would cause strict
 verification failures of Manifests. To account for this, Infra could
-provide either ``OPTIONAL`` entries for the Manifest files to allow them
-in non-strict verification mode, or ``IGNORE`` entries to allow them
-in the strict mode.
+provide ``IGNORE`` entries to allow them to exist.
 
 
 Splitting distfile checksums from file checksums