aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-08-21 20:54:07 +0000
committerThierry Vignaud <tv@mageia.org>2012-08-21 20:54:07 +0000
commit9ac75ac8b8d309493c7aa64d14f08bcd14b8afad (patch)
tree30f37f4aa3339726411d26756de02cd1a1c063a2
parent06c0809c882715dd0f2c6de075668746a767f074 (diff)
downloadrpm-setup-9ac75ac8b8d309493c7aa64d14f08bcd14b8afad.tar
rpm-setup-9ac75ac8b8d309493c7aa64d14f08bcd14b8afad.tar.gz
rpm-setup-9ac75ac8b8d309493c7aa64d14f08bcd14b8afad.tar.bz2
rpm-setup-9ac75ac8b8d309493c7aa64d14f08bcd14b8afad.tar.xz
rpm-setup-9ac75ac8b8d309493c7aa64d14f08bcd14b8afad.zip
ignore fontconfig.prov exit code (mga#7078) which is random
rationale: it runs fc-query on every path matching /usr/share/fonts so its error code is the the one of the latest fc-query whose argument can be a directory or fonts.scale ...
-rw-r--r--NEWS2
-rwxr-xr-xfind-provides.in3
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 1dd6f26..964fad4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- find-provides: ignore fontconfig.prov exit code (mga#7078)
+
Version 1.155 - 2 Aug 2012, by Thierry Vignaud
- drop very old rpmbuild aliases on rpm which warns about being deprecated for
quite a long time
diff --git a/find-provides.in b/find-provides.in
index c14ef6d..e64b34f 100755
--- a/find-provides.in
+++ b/find-provides.in
@@ -103,8 +103,7 @@ fi
#
# --- fonts
[ -x @RPMLIBDIR@/fontconfig.prov ] &&
- echo "$filelist" | tr '[:blank:]' \\n | @RPMLIBDIR@/fontconfig.prov --provides | sort -u \
- && test ${PIPESTATUS[2]} -ne 0 && echo 'error: @RPMLIBDIR@/fontconfig.prov failed' >&2 && exit 1
+ echo "$filelist" | tr '[:blank:]' \\n | @RPMLIBDIR@/fontconfig.prov --provides | sort -u
#
# --- typelib() gobject-introspection bindings