Merge lp:~kirkland/ubuntu-release-upgrader/1173209 into lp:ubuntu-release-upgrader

[Dustin Kirkland ]

[Brian Murray (brian-murray)]

I think there should also be a fix included in the Raring SRU of this that cleans up release-upgrade-available for people who have already upgraded to Raring.

[Dustin Kirkland  (kirkland)]

Sure, Brian, I totally agree. I assumed this needed to be in trunk first, before we discussed Raring SRU. But yeah, I'm with you...

=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2013-04-18 17:42:14 +0000
+++ DistUpgrade/DistUpgradeController.py	2013-05-07 15:51:24 +0000
@@ -1762,6 +1762,10 @@
         if self.aptcdrom:
             self.aptcdrom.comment_out_cdrom_entry()
 
+        # remove upgrade-available notice
+        if os.path.exists("/var/lib/ubuntu-release-upgrader/release-upgrade-available"):
+            os.unlink("/var/lib/ubuntu-release-upgrader/release-upgrade-available")
+
         # done, ask for reboot
         self._view.setStep(STEP_REBOOT)
         self._view.updateStatus(_("System upgrade is complete."))            

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-30 18:17:22 +0000
+++ debian/changelog	2013-05-07 15:51:24 +0000
@@ -1,3 +1,15 @@
+ubuntu-release-upgrader (1:0.195) UNRELEASED; urgency=low
+
+  * debian/release-upgrade-motd: LP: #1173209
+    - recheck release upgrade once-a-day, even if stamp file is
+      already populated
+    - this partially fixes the sticky "upgrade available" message,
+      after successfully upgrading, even if the stamp is not removed
+  * DistUpgrade/DistUpgradeController.py: LP: #1173209
+    - remove the upgrade-available flag, on upgrade completion
+
+ -- Dustin Kirkland <[e-mail]>  Tue, 07 May 2013 10:37:12 -0500
+
 ubuntu-release-upgrader (1:0.194) saucy; urgency=low
 
   * support raring->saucy release upgrades harder

=== modified file 'debian/release-upgrade-motd'
--- debian/release-upgrade-motd	2012-06-06 21:23:35 +0000
+++ debian/release-upgrade-motd	2013-05-07 15:51:24 +0000
@@ -21,18 +21,18 @@
 
 
 stamp=/var/lib/ubuntu-release-upgrader/release-upgrade-available
-if [ -s "$stamp" ]; then
-	# Stamp exists and is populated, so display
-	cat "$stamp"
-	echo
-elif [ -f "$stamp" ]; then
-	# Stamp exists, but is empty, see if it's expired
+if [ -f "$stamp" ]; then
+	# Stamp exists, see if it's expired
 	now=$(date +%s)
         lastrun=$(stat -c %Y "$stamp") 2>/dev/null || lastrun=0
         expiration=$(expr $lastrun + 86400)
         if [ $now -ge $expiration ]; then
-		# But is older than 1 day old, so update in the background
+		# Older than 1 day old, so update in the background
 		/usr/lib/ubuntu-release-upgrader/check-new-release -q > "$stamp" &
+	elif [ -s "$stamp" ]; then
+		# Less than 1 day old, and non-empty, so display now
+		cat "$stamp"
+		echo
 	fi
 else
 	# No cache at all, so update in the background