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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/emacs-tools:emacs-updater commit in: /
Date: Tue,  7 Jun 2016 12:50:50 +0000 (UTC)	[thread overview]
Message-ID: <1465302854.e58107167fffbe1d0e4c0560b8be5a9d28c5c55d.ulm@gentoo> (raw)

commit:     e58107167fffbe1d0e4c0560b8be5a9d28c5c55d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 12:34:14 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 12:34:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=e5810716

Run qfile under xargs since it has lost the -f option.

* emacs-updater: Run qfile under xargs since portage-utils-0.61
has lost the -f option. Fixes bug 584984. Enable the pipefail
option in bash, in order to check qfile's exit status.

 ChangeLog     |  6 ++++++
 emacs-updater | 10 +++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f8124d..8954223 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-07  Ulrich Müller  <ulm@gentoo.org>
+
+	* emacs-updater: Run qfile under xargs since portage-utils-0.61
+	has lost the -f option. Fixes bug 584984. Enable the pipefail
+	option in bash, in order to check qfile's exit status.
+
 2014-06-05  Ulrich Müller  <ulm@gentoo.org>
 
 	* Version 1.14 released.

diff --git a/emacs-updater b/emacs-updater
index 8d33bae..361817b 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -268,6 +268,7 @@ cleanup() {
 }
 
 trap cleanup EXIT
+set -o pipefail
 
 TMPFILE="$(mktemp ${TMPDIR:-/tmp}/emacs-updater.files.XXXXXX)"
 PKGFILE="$(mktemp ${TMPDIR:-/tmp}/emacs-updater.pkgs.XXXXXX)"
@@ -286,14 +287,17 @@ NO_OF_FILES=$(wc -l <"${TMPFILE}")
 message "Assigning ${NO_OF_FILES} file${s} to packages ..."
 
 if [[ ${ORPHANS} ]]; then
-    qfile -oCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
+    xargs qfile -oCR <"${TMPFILE}" | sort -u >"${PKGFILE}"
 elif [[ ${EXACT} ]]; then
-    qfile -eqCR -f "${TMPFILE}" | sort -u | sed 's/^/=/' > "${PKGFILE}"
+    xargs qfile -eqCR <"${TMPFILE}" | sort -u | sed 's/^/=/' >"${PKGFILE}"
 else
     # Get package and slot number, requires >=portage-utils-0.3
-    qfile -SqCR -f "${TMPFILE}" | sort -u > "${PKGFILE}"
+    xargs qfile -SqCR <"${TMPFILE}" | sort -u >"${PKGFILE}"
 fi
 
+ret=$?
+[[ ${ret} -eq 0 ]] || { failure "Error running qfile"; exit ${ret}; }
+
 NO_OF_PACKAGES=$(wc -l <"${PKGFILE}")
 [[ ${NO_OF_PACKAGES} -eq 1 ]] && s= || s=s
 if [[ ${ORPHANS} ]]; then

next             reply	other threads:[~2016-06-07 12:50 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-07 12:50 Ulrich Müller [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-09 18:36 [gentoo-commits] proj/emacs-tools:emacs-updater commit in: / Ulrich Müller
2024-12-09  9:45 Ulrich Müller
2024-12-07  8:01 Ulrich Müller
2024-06-05 14:08 Ulrich Müller
2024-05-02 16:52 Ulrich Müller
2024-05-02 16:52 Ulrich Müller
2024-05-02 16:52 Ulrich Müller
2024-05-02 16:52 Ulrich Müller
2023-09-25 18:54 Ulrich Müller
2023-09-25 18:47 Ulrich Müller
2019-08-30 22:02 Ulrich Müller
2019-08-30 22:02 Ulrich Müller
2018-12-09 22:37 Ulrich Müller
2018-09-16 14:50 Ulrich Müller
2016-06-08  6:53 Ulrich Müller
2016-06-07 22:20 Ulrich Müller
2016-06-07 13:06 Ulrich Müller
2016-06-07 12:50 Ulrich Müller
2014-06-05 17:07 Ulrich Müller
2014-06-05 16:43 Ulrich Müller
2014-05-20  6:49 Ulrich Müller
2014-05-19 18:14 Ulrich Müller
2014-05-19 18:14 Ulrich Müller
2013-08-09 13:57 Ulrich Mueller
2013-03-20 17:03 Ulrich Mueller
2013-03-20 16:54 Ulrich Mueller
2013-03-12 18:55 Ulrich Mueller
2013-03-12 18:55 Ulrich Mueller
2013-03-12 18:55 Ulrich Mueller
2013-03-11 11:27 Ulrich Mueller
2013-03-11 10:15 Ulrich Mueller
2013-03-11  9:43 Ulrich Mueller
2013-03-11  8:23 Ulrich Mueller
2013-03-09 12:31 Ulrich Mueller
2013-03-09 12:31 Ulrich Mueller
2013-03-09 12:31 Ulrich Mueller
2012-10-11  8:20 Ulrich Mueller
2012-10-11  8:20 Ulrich Mueller
2012-10-08 20:59 Ulrich Mueller
2012-10-08 20:45 Ulrich Mueller
2012-05-06 18:47 Ulrich Mueller
2012-05-06 18:14 Ulrich Mueller
2012-05-06 16:07 [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1480 " Sebastian Pipping
2012-05-06 16:06 ` [gentoo-commits] proj/emacs-tools:emacs-updater " Sebastian Pipping
2012-05-06 16:07 [gentoo-commits] proj/emacs-tools:backups/emacs-updater@1480 " Sebastian Pipping
2012-05-06 16:06 ` [gentoo-commits] proj/emacs-tools:emacs-updater " Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:7f8124d dfblob:8954223 dfblob:8d33bae dfblob:361817b )
 OR (
bs:"[gentoo-commits] proj/emacs-tools:emacs-updater commit in: /" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1465302854.e58107167fffbe1d0e4c0560b8be5a9d28c5c55d.ulm@gentoo \
    --to=ulm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox