Merge lp:~mvo/ubuntu-release-upgrader/text-install-progress into lp:ubuntu-release-upgrader

[Michael Vogt]

This tiny branch adds progress information into the text-mode upgrader.
Useful to guess how long the upgrade will take.

[Michael Vogt (mvo)]

P.S. If this looks good I'm happy to do the merge/upload, just want to have a additional pair of eyes on it.

[Brian Murray (brian-murray)]

I saw Total Progess [02.02] which doesn't seem that informative to me. A whole number followed by a percent sign would be more informative e.g. "Total Progress [22%]".

review: Needs Fixing

[Michael Vogt (mvo)]

Indeed, good point. I added the "%" at the end now.

[Michael Vogt (mvo)]

Is there a chance that this gets in for trusty?

It would be nice to have some progress reporting for users who do server upgrades. But I understand that the added string will probably need a exception (or multiple ones) at this point.

Thanks,
 Michael

[Michael Vogt (mvo)]

I updated the branch now so that it avoids a string break. Still a FeatureFreezeException required I guess.

[Brian Murray (brian-murray)]

The file README.devel actually contains a typo or two in that it mentions ubuntu-release-upgrade not ubuntu-release-upgrader.

[Brian Murray (brian-murray)]

I've tested this again and see "Progress [ 15%]" now, so this looks good to me. Sorry for the delay in getting this reviewed.

review: Approve

=== modified file 'DistUpgrade/DistUpgradeViewText.py'
--- DistUpgrade/DistUpgradeViewText.py	2012-12-13 16:42:43 +0000
+++ DistUpgrade/DistUpgradeViewText.py	2014-04-08 09:16:22 +0000
@@ -24,6 +24,7 @@
 import sys
 import logging
 import subprocess
+from gettext import dgettext
 
 import apt
 import os
@@ -51,6 +52,24 @@
         return True
 
 
+class TextInstallProgress(InstallProgress):
+
+    # percent step when progress is reported (to avoid screen spam)
+    MIN_REPORTING = 5
+
+    def __init__(self, *args, **kwargs):
+        super(TextInstallProgress, self).__init__(*args, **kwargs)
+        self._prev_percent = 0
+
+    def status_change(self, pkg, percent, status):
+        if self._prev_percent + self.MIN_REPORTING < percent:
+            # FIXME: move into ubuntu-release-upgrader after trusty
+            domain = "libapt-pkg4.12"
+            progress_str = dgettext(domain, "Progress: [%3i%%]") % int(percent)
+            sys.stdout.write("\r\n%s\r\n" % progress_str)
+            self._prev_percent = percent
+
+
 class TextCdromProgressAdapter(apt.progress.base.CdromProgress):
     """ Report the cdrom add progress  """
     def update(self, text, step):
@@ -88,7 +107,7 @@
         self._opCacheProgress = apt.progress.text.OpProgress()
         self._acquireProgress = TextAcquireProgress()
         self._cdromProgress = TextCdromProgressAdapter()
-        self._installProgress = InstallProgress()
+        self._installProgress = TextInstallProgress()
         sys.excepthook = self._handleException
         #self._process_events_tick = 0
 

=== added file 'README.devel'
--- README.devel	1970-01-01 00:00:00 +0000
+++ README.devel	2014-04-08 09:16:22 +0000
@@ -0,0 +1,11 @@
+How to test run the release-upgrade
+===================================
+
+In a VM or chroot run:
+$ bzr co lp:ubuntu-release-upgrade
+$ cd ubuntu-release-upgrade/DistUpgrade
+$ sudo ./dist-upgrade --datadir=../data
+
+or to test a specific frontend
+$ sudo ./dist-upgrade --datadir=../data --frontend DistUpgradeViewText
+(or DistUpgradeViewGtk3)