From 83c351f01fb75016df825c3ac3650eb829f2d350 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Sun, 7 Nov 2010 09:18:02 -0600
Subject: [PATCH] * usr/bin/byobu-status, usr/lib/byobu/notify_osd:   - fix all
 detail printing

---
 debian/changelog         | 2 ++
 usr/bin/byobu-status     | 2 +-
 usr/lib/byobu/notify_osd | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 160ba891..e9fd43e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ byobu (3.7) unreleased; urgency=low
     usr/lib/byobu/Makefile.am, usr/lib/byobu/raid,
     usr/share/byobu/profiles/common, usr/share/man/man1/byobu.1:
     - add a raid notification, LP: #669191
+  * usr/bin/byobu-status, usr/lib/byobu/notify_osd:
+    - fix all detail printing
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 21 Oct 2010 12:09:14 -0500
 
diff --git a/usr/bin/byobu-status b/usr/bin/byobu-status
index 8493bb4c..5ac9a402 100755
--- a/usr/bin/byobu-status
+++ b/usr/bin/byobu-status
@@ -75,7 +75,7 @@ case "$P" in
 			[ "$i" = "menu" ] && continue
 			script=`find_script $i`
 			short=`$script --short | sed -e 's/^\s*//' -e 's/\s*$//' -e 's/.{[^}]*}//g'` || true
-			detail=`$script --detail | sed -e '/^$/d' -e 's/^/\t/g'` || true
+			detail=`$script --detail 2>/dev/null | sed -e '/^$/d' -e 's/^/\t/g'` || true
 			printf "%s\n\t(%s)\n" "$short" "$i"
 			[ -n "$detail" ] && printf "%s\n" "$detail"
 		done
diff --git a/usr/lib/byobu/notify_osd b/usr/lib/byobu/notify_osd
index b1ea4f48..735e1c63 100755
--- a/usr/lib/byobu/notify_osd
+++ b/usr/lib/byobu/notify_osd
@@ -22,8 +22,11 @@ LOG="$HOME"/.cache/notify-osd.log
 [ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr"
 
 case "$1" in
+	--short)
+		exit 0
+	;;
 	--detail)
-		cat "$LOG"
+		cat "$LOG" || true
 		exit 0
 	;;
 esac