summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvangelos Foutras <evangelos@foutrelis.com>2015-11-25 11:58:39 +0100
committerAllan McRae <allan@archlinux.org>2015-11-28 13:57:24 +0100
commit34bbe4cf7b8c70fda3475ee2e936db93c4fe427a (patch)
treee47f103bddbb4cecb683d39b5b7674af23c2dd1b
parent5312e683fcc800e528c01d652aab30e862e44a0b (diff)
downloadpacman-34bbe4cf7b8c70fda3475ee2e936db93c4fe427a.tar.gz
pacman-34bbe4cf7b8c70fda3475ee2e936db93c4fe427a.tar.xz
pacdiff: do not require DIFFPROG for -o/--output
Signed-off-by: Evangelos Foutras <evangelos@foutrelis.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--contrib/pacdiff.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in
index 90eb3cc2..a4faba2e 100644
--- a/contrib/pacdiff.sh.in
+++ b/contrib/pacdiff.sh.in
@@ -118,7 +118,7 @@ done
m4_include(../scripts/library/term_colors.sh)
-if ! type -p ${diffprog%% *} >/dev/null; then
+if ! type -p ${diffprog%% *} >/dev/null && (( ! OUTPUTONLY )); then
error "Cannot find the $diffprog binary required for viewing differences."
exit 1
fi