From 111a2d8f436797ec7648250f9ece84ed92be5e42 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <dustin.kirkland@gmail.com>
Date: Tue, 28 Feb 2012 15:00:56 -0600
Subject: [PATCH] * usr/lib/byobu/reboot_required,
 usr/lib/byobu/updates_available:   - powersave flag and reload flag suffered
 from the same problem     as LP: #942469

---
 debian/changelog                | 3 +++
 usr/lib/byobu/reboot_required   | 5 +++++
 usr/lib/byobu/updates_available | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 10098c0a..06620104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ byobu (5.16) unreleased; urgency=low
   * usr/lib/byobu/updates_available: LP: #942469
     - fix regression clearing updates_available status
     - and fix a typo in that commit
+  * usr/lib/byobu/reboot_required, usr/lib/byobu/updates_available:
+    - powersave flag and reload flag suffered from the same problem
+      as LP: #942469
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 23 Feb 2012 15:01:55 -0600
 
diff --git a/usr/lib/byobu/reboot_required b/usr/lib/byobu/reboot_required
index d6e5e9e0..cae9f24e 100755
--- a/usr/lib/byobu/reboot_required
+++ b/usr/lib/byobu/reboot_required
@@ -31,14 +31,19 @@ __reboot_required_detail() {
 }
 
 __reboot_required() {
+	local status="$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/reboot_required"
 	if [ -e "$REBOOT_FLAG" ]; then
 		color b W; printf "$ICON_REBOOT"; color --;
 	fi
 	if [ -e "$RELOAD_FLAG" ]; then
 		color b W; printf "<"; color -; color b b W; printf "F5"; color -; color b W; printf ">"; color -; printf " "
+	elif [ -s "$status" ]; then
+		rm -f "$status"
 	fi
 	if [ -e "$POWERNAP_FLAG" ]; then
 		color b W; printf ".zZ"; color --
+	elif [ -s "$status" ]; then
+		rm -f "$status"
 	fi
 }
 
diff --git a/usr/lib/byobu/updates_available b/usr/lib/byobu/updates_available
index df44c5ea..a61bd994 100755
--- a/usr/lib/byobu/updates_available
+++ b/usr/lib/byobu/updates_available
@@ -31,7 +31,7 @@ ___print_updates() {
 				printf "$ICON_UPDATES"
 			fi
 			color --
-		elif [ "$u" = "0" ]; then
+		elif [ "$u" = "0" ] && [ -e "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/updates_available" ]; then
 			# Clear out byobu's status cache
 			rm -f "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/updates_available"*
 		fi