[gentoo-commits] proj/emacs-tools:emacs-updater commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     58c7c3ee49dd1987c8542d709340e1315180df86
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 18:45:47 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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  <ulm@gentoo.org>
+
+	* 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  <ulm@gentoo.org>
 
 	* 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}"