From 38726003bfe2684a99f5a789107c6558e67e1407 Mon Sep 17 00:00:00 2001
From: root <root@mail.bitbase.dk>
Date: Mon, 15 Dec 2008 14:02:45 +0100
Subject: Suppress lazygal Makernote warnings in localwebgallerydaemon.
---
localwebgallerydaemon | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/localwebgallerydaemon b/localwebgallerydaemon
index a43da53..b1d1c28 100755
--- a/localwebgallerydaemon
+++ b/localwebgallerydaemon
@@ -100,8 +100,12 @@ fi
# Check if generator is supported and declare needed external programs
case $generator in
- lazygal) which "$generator" >/dev/null \
- || exit1 "Unsupported generator \"$generator\" (try --generator=list).";;
+ lazygal)
+ which "$generator" >/dev/null \
+ || exit1 "Unsupported generator \"$generator\" (try --generator=list)."
+ which "mispipe" >/dev/null \
+ || exit1 "Helper tool \"mispipe\" (part of \"moreutils\") is unavailable."
+ ;;
*) exit1 "Unsupported generator \"$generator\".";;
esac
@@ -125,7 +129,10 @@ updategallery() {
onemoretime=
case "$generator" in
lazygal)
- lazygal $lazygal_opts $lazygal_theme_opts -o "$targetdir" "$sourcedir"
+ mispipe \
+ "lazygal $lazygal_opts $lazygal_theme_opts -o \"$targetdir\" \"$sourcedir\" 2>&1" \
+ "egrep -v '^(Error: Directory Makernote with 5376 entries considered invalid; not read.|Warning: Failed to read Makernote, rc = 6)$'" \
+ || onemoretime=yes
;;
esac
[ "--once" = "$1" ] || sleep 10
--
cgit v1.2.3