[Logcheck-commits] Hannes von Haugwitz: src/logcheck: fixed broken '-t' option

[Hannes von Haugwitz]

Module: logcheck
Branch: master
Commit: 589cf7c64eebec3016fdf2f3aee0b56c8b52edd9
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=589cf7c64eebec3016fdf2f3aee0b56c8b52edd9

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Sat Jun 30 14:52:11 2012 +0200

src/logcheck: fixed broken '-t' option

closes: #647622

---

 debian/changelog |    3 +++
 src/logcheck     |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ba68aa6..68b8bf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ logcheck (1.3.15) UNRELEASED; urgency=low
   [ Hannes von Haugwitz ]
   * ignore.d.server/dropbear: new
     - ignore successful logins (closes: #652148)
+  * src/logcheck:
+    - fixed broken '-t' option, thanks to Jon Daley (closes: #647622,
+      LP: #1010431)
 
   [ Frédéric Brière ]
   * ignore.d.server/postfix:
diff --git a/src/logcheck b/src/logcheck
index 5878795..22674d8 100755
--- a/src/logcheck
+++ b/src/logcheck
@@ -431,7 +431,7 @@ logoutput() {
     if [ -f "$file" ]; then
 	offsetfile="$STATEDIR/offset$(echo "$file" | tr / .)"
 	debug "Running $LOGTAIL on $file"
-	$LOGTAIL -f "$file" -o "$offsetfile" $LOGTAIL_OPTS \
+	$LOGTAIL $LOGTAIL_OPTS -f "$file" -o "$offsetfile" \
 	    >> "$TMPDIR/logoutput/$(basename "$file")" 2>&1 \
 	    || error "Could not run logtail or save output"
     else
@@ -587,7 +587,7 @@ while getopts "$GETOPTS" opt; do
 	    ;;
 	t)
 	    debug "Setting LOGTAIL_OPTS to -t"
-	    LOGTAIL_OPTS=' -t'
+	    LOGTAIL_OPTS='-t'
 	    ;;
 	w)
 	    debug "Setting REPORTLEVEL to workstation"