| 1 |
commit: 75bbb25e8db29a3d09b7da57f3b9fd9bddd79e11 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 2 18:19:35 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 2 19:09:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/data/glep.git/commit/?id=75bbb25e |
| 7 |
|
| 8 |
glep-0074: Remove OPTIONAL |
| 9 |
|
| 10 |
glep-0074.rst | 29 ++++------------------------- |
| 11 |
1 file changed, 4 insertions(+), 25 deletions(-) |
| 12 |
|
| 13 |
diff --git a/glep-0074.rst b/glep-0074.rst |
| 14 |
index b7b5a8c..f256451 100644 |
| 15 |
--- a/glep-0074.rst |
| 16 |
+++ b/glep-0074.rst |
| 17 |
@@ -148,13 +148,7 @@ used: |
| 18 |
|
| 19 |
c. otherwise, the verification succeeds. |
| 20 |
|
| 21 |
-3. If the file is covered by an entry of the ``OPTIONAL`` type: |
| 22 |
- |
| 23 |
- a. if the file is present, then the verification fails, |
| 24 |
- |
| 25 |
- b. otherwise, the verification succeeds. |
| 26 |
- |
| 27 |
-4. If the file is present but not listed in Manifest, the verification |
| 28 |
+3. If the file is present but not listed in Manifest, the verification |
| 29 |
fails. |
| 30 |
|
| 31 |
Unless specified otherwise, the package manager must not allow using |
| 32 |
@@ -221,13 +215,6 @@ The Manifest files can specify the following tags: |
| 33 |
in non-strict mode. Used for files that do not affect the installed |
| 34 |
packages (``metadata.xml``, ``use.desc``). |
| 35 |
|
| 36 |
-``OPTIONAL <path>`` |
| 37 |
- Specifies a file that does not exist in the distribution but if it |
| 38 |
- did, it would be marked as ``MISC``. In the strict mode, the file |
| 39 |
- must not exist for the verification to pass. The package manager |
| 40 |
- may ignore a stray file matching this entry if operating in non-strict |
| 41 |
- mode. |
| 42 |
- |
| 43 |
``DIST <filename> <size> <checksums>…`` |
| 44 |
Specifies a distfile entry used to verify files fetched as part |
| 45 |
of ``SRC_URI``. The filename must match the filename used to store |
| 46 |
@@ -272,8 +259,8 @@ can be used: |
| 47 |
4. Process all ``IGNORE`` entries. Remove any paths matching them |
| 48 |
from the *present* set. |
| 49 |
|
| 50 |
-5. Collect all files covered by ``DATA``, ``MISC``, ``OPTIONAL``, |
| 51 |
- ``EBUILD`` and ``AUX`` entries into the *covered* set. |
| 52 |
+5. Collect all files covered by ``DATA``, ``MISC``, ``EBUILD`` |
| 53 |
+ and ``AUX`` entries into the *covered* set. |
| 54 |
|
| 55 |
6. Verify the entries in *covered* set for incompatible duplicates |
| 56 |
and collisions with ignored files as explained in `Manifest file |
| 57 |
@@ -550,12 +537,6 @@ It aims to account for two use cases: |
| 58 |
2. Accounting for automatically generated files that might be updated |
| 59 |
by standard tooling. |
| 60 |
|
| 61 |
-The traditional ``MISC`` type is amended with a complementary |
| 62 |
-``OPTIONAL`` tag to account for files that are not provided |
| 63 |
-in the specific repository. It aims to ensure that the same path would |
| 64 |
-be non-fatal when provided by the repository but fatal when created |
| 65 |
-by the user tooling. |
| 66 |
- |
| 67 |
|
| 68 |
Timestamp field |
| 69 |
--------------- |
| 70 |
@@ -643,9 +624,7 @@ on providing them via an additional rsync module. |
| 71 |
|
| 72 |
If such files were injected into the repository, they would cause strict |
| 73 |
verification failures of Manifests. To account for this, Infra could |
| 74 |
-provide either ``OPTIONAL`` entries for the Manifest files to allow them |
| 75 |
-in non-strict verification mode, or ``IGNORE`` entries to allow them |
| 76 |
-in the strict mode. |
| 77 |
+provide ``IGNORE`` entries to allow them to exist. |
| 78 |
|
| 79 |
|
| 80 |
Splitting distfile checksums from file checksums |
Archives