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 2C28B158089 for ; Mon, 25 Sep 2023 18:47:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70AB02BC01B; Mon, 25 Sep 2023 18:47:24 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 59A9B2BC01B for ; Mon, 25 Sep 2023 18:47:24 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5F49335C7A for ; Mon, 25 Sep 2023 18:47:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 521941264 for ; Mon, 25 Sep 2023 18:47:22 +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: <1695667547.58c7c3ee49dd1987c8542d709340e1315180df86.ulm@gentoo> Subject: [gentoo-commits] proj/emacs-tools:emacs-updater commit in: / X-VCS-Repository: proj/emacs-tools X-VCS-Files: ChangeLog emacs-updater X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 58c7c3ee49dd1987c8542d709340e1315180df86 X-VCS-Branch: emacs-updater Date: Mon, 25 Sep 2023 18:47:22 +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: c944fdc7-2337-4a81-bfea-18c9ed4ca2b4 X-Archives-Hash: 56c49cead959911ac69f61edebf9e9c7 commit: 58c7c3ee49dd1987c8542d709340e1315180df86 Author: Ulrich Müller gentoo org> AuthorDate: Mon Sep 25 18:45:47 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Sep 25 18:45:47 2023 +0000 URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=58c7c3ee qfile has lost its -e option * emacs-updater: The -e,--exact option of qfile no longer works in portage-utils-0.80 or later. The "exact package" functionality is now available with the -v,--verbose option (--verbose --quiet looks strange, but is not a contradiction here). Fixes bug 914479. Bug: https://bugs.gentoo.org/914479 Signed-off-by: Ulrich Müller gentoo.org> ChangeLog | 7 +++++++ emacs-updater | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5da7ab..f21d36f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-09-25 Ulrich Müller + + * emacs-updater: The -e,--exact option of qfile no longer works in + portage-utils-0.80 or later. The "exact package" functionality is + now available with the -v,--verbose option (--verbose --quiet + looks strange, but is not a contradiction here). Fixes bug 914479. + 2019-08-30 Ulrich Müller * Version 1.16 released. diff --git a/emacs-updater b/emacs-updater index ce308e5..3cf85b0 100755 --- a/emacs-updater +++ b/emacs-updater @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2007-2019 Gentoo Authors +# Copyright 2007-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 or later # Authors: @@ -292,7 +292,7 @@ message "Assigning ${NO_OF_FILES} file${s} to packages ..." if [[ ${ORPHANS} ]]; then xargs qfile -oCR <"${TMPFILE}" | sort -u >"${PKGFILE}" elif [[ ${EXACT} ]]; then - xargs qfile -eqCR <"${TMPFILE}" | sort -u | sed 's/^/=/' >"${PKGFILE}" + xargs qfile -vqCR <"${TMPFILE}" | sort -u | sed 's/^/=/' >"${PKGFILE}" else # Get package and slot number, requires >=portage-utils-0.3 xargs qfile -SqCR <"${TMPFILE}" | sort -u >"${PKGFILE}"