From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 855021396D9 for ; Thu, 2 Nov 2017 19:09:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 256FEE0D09; Thu, 2 Nov 2017 19:09:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6CAFE0D09 for ; Thu, 2 Nov 2017 19:09:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A478C341764 for ; Thu, 2 Nov 2017 19:09:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E18FD92AE for ; Thu, 2 Nov 2017 19:09:40 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1509649757.75bbb25e8db29a3d09b7da57f3b9fd9bddd79e11.mgorny@gentoo> Subject: [gentoo-commits] data/glep:glep-manifest commit in: / X-VCS-Repository: data/glep X-VCS-Files: glep-0074.rst X-VCS-Directories: / X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 75bbb25e8db29a3d09b7da57f3b9fd9bddd79e11 X-VCS-Branch: glep-manifest Date: Thu, 2 Nov 2017 19:09:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ec02943b-6022-494b-8996-76d743fae26f X-Archives-Hash: 9ca0f1fb20b67fbc78b1491bed2c878c commit: 75bbb25e8db29a3d09b7da57f3b9fd9bddd79e11 Author: Michał Górny gentoo org> AuthorDate: Thu Nov 2 18:19:35 2017 +0000 Commit: Michał Górny gentoo 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 `` - 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 …`` 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