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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8063C15815E for ; Thu, 8 Feb 2024 11:15:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBA6EE2A03; Thu, 8 Feb 2024 11:15:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9BC60E2A03 for ; Thu, 8 Feb 2024 11:15:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A11C5343141 for ; Thu, 8 Feb 2024 11:15:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08E6DACA for ; Thu, 8 Feb 2024 11:15:31 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1707390850.5cb6b40137d1ce49d94f355dd15ddd512c2f8c7b.ulm@gentoo> Subject: [gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/package-moves/ X-VCS-Repository: proj/devmanual X-VCS-Files: ebuild-maintenance/package-moves/text.xml X-VCS-Directories: ebuild-maintenance/package-moves/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 5cb6b40137d1ce49d94f355dd15ddd512c2f8c7b X-VCS-Branch: master Date: Thu, 8 Feb 2024 11:15:31 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 85570f61-43f2-4f3c-8438-34246fdfde18 X-Archives-Hash: d050f04abf7486f79a8692350a45d3b4 commit: 5cb6b40137d1ce49d94f355dd15ddd512c2f8c7b Author: Michał Górny gentoo org> AuthorDate: Sun Jan 21 14:41:51 2024 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Thu Feb 8 11:14:10 2024 +0000 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5cb6b401 package-moves: Allow moving back, and describe how to chain updates Make the rule forbidding reusing old package names less strict. There is no real reason not to move packages back — we can safely assume that the package manager will handle that just fine. The only real restriction is that no other package must reuse any of the old names, i.e. effectively cause the package manager to attempt merging the packages together. Add explicit rules for updating old package move entries. These match the logic used in pkgcheck, and therefore ensure both correct results and no warnings from pkgcheck. Signed-off-by: Michał Górny gentoo.org> [Replace Unicode subscripts by markup] Signed-off-by: Ulrich Müller gentoo.org> ebuild-maintenance/package-moves/text.xml | 50 +++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/ebuild-maintenance/package-moves/text.xml b/ebuild-maintenance/package-moves/text.xml index eab8848..9c07db5 100644 --- a/ebuild-maintenance/package-moves/text.xml +++ b/ebuild-maintenance/package-moves/text.xml @@ -19,8 +19,10 @@ the following must be noted:
  • Once an update entry is created, the old package name (or slot) cannot be - reused. Attempting to reuse it will cause updates to apply again, - to the reused name. This also means that updates cannot be undone. + reused for another package. Attempting to reuse it will cause updates to + apply again, to the reused name. This also means that while a package can + be moved back to its previous name, all the names historically used for + a package are reserved to it alone.
  • Updates can only perform one-to-one moves. They cannot be used to merge @@ -113,6 +115,50 @@ you have updated every file in profiles/ directory that happens to contain an entry which may be affected by your change.

    + + + +
    +Updating prior update entries when moving the package again + + +

    +When the same package is moved again, the previous update entries should +be updated appropriately. This is meant to make the situation more transparent +to users reading update entries and to ensure that the process is handled +efficiently even if the package manager does not implement updates in a robust +way. This involves the following steps: +

    + +
      +
    1. + The previous package moves for the package in question must be updated + to reference the final name. That is, rather than the chain A → B → C, + we want to have two update entries: A → C, and B → C. +
      2. + +
    2. + If the package is being moved to a name that it used before, the original + move entry must be removed. That is, rather than the chain A → B → A, + we want to have the reverse entry: B → A. If the package manager did not + move A → B before, we don't want it to touch the package at all. +
      3. + +
    3. + As a combination of the two aforementioned steps, a chain of A → B → C → A + would be replaced by two moves: B → A, and C → A. +
      4. + +
    4. + If the package was slot-moved before, the slot moves should be updated + to use the final package name, and moved after the final package move. + That is, rather than the chain: A:S1 → A:S2, A → B; + we prefer to have the chain: A → B, B:S1 → B:S2. + All package and slot move entries must reside in the same file then, to + guarantee sequential processing. +
      5. +
    +