Merge lp:~mvo/ubuntu-release-upgrader/partial-upgrade-cleanup into lp:ubuntu-release-upgrader

[Michael Vogt]

This branch fixes:
- a crash when the DistUpgradeViewText is used with py3
- fixes a bug with the logging setup (LP: #1302380) (thanks for the fix to Brian Murray and https://code.launchpad.net/~brian-murray/ubuntu-release-upgrader/bug-1302380/+merge/214349)
- fixes a crash when do-partial-upgrade is used without a DISPLAY

[Brian Murray (brian-murray)]

It looks to me like the readline change with fix bug 1243619.

[Brian Murray (brian-murray)]

This looks good to me, but I reference bug 1243619 if it is in fact fixed by the readline changes.

review: Approve

=== modified file 'DistUpgrade/DistUpgradeViewText.py'
--- DistUpgrade/DistUpgradeViewText.py	2012-12-13 16:42:43 +0000
+++ DistUpgrade/DistUpgradeViewText.py	2014-04-08 08:32:01 +0000
@@ -41,6 +41,14 @@
 from .utils import twrap
 
 
+def readline():
+    """ py2/py3 compatible readline from stdin """
+    s = sys.stdin.readline()
+    if hasattr(s, "decode"):
+        return s.decode(ENCODING, "backslashreplace")
+    return s
+
+
 class TextAcquireProgress(AcquireProgress, apt.progress.text.AcquireProgress):
     def __init__(self):
         apt.progress.text.AcquireProgress.__init__(self)
@@ -135,7 +143,7 @@
       if extended_msg:
         print(twrap(extended_msg))
       print(_("To continue please press [ENTER]"))
-      sys.stdin.readline().decode(ENCODING, "backslashreplace")
+      readline()
     def error(self, summary, msg, extended_msg=None):
       print()
       print(twrap(summary))
@@ -169,7 +177,7 @@
       print(" %s %s" % (_("Continue [yN] "), _("Details [d]")), end="")
       sys.stdout.flush()
       while True:
-        res = sys.stdin.readline().decode(ENCODING, "backslashreplace")
+        res = readline()
         # TRANSLATORS: the "y" is "yes"
         if res.strip().lower().startswith(_("y")):
           return True
@@ -213,14 +221,14 @@
       print(twrap(msg))
       if default == 'No':
           print(_("Continue [yN] "), end="")
-          res = sys.stdin.readline().decode(ENCODING, "backslashreplace")
+          res = readline()
           # TRANSLATORS: first letter of a positive (yes) answer
           if res.strip().lower().startswith(_("y")):
               return True
           return False
       else:
           print(_("Continue [Yn] "), end="")
-          res = sys.stdin.readline().decode(ENCODING, "backslashreplace")
+          res = readline()
           # TRANSLATORS: first letter of a negative (no) answer
           if res.strip().lower().startswith(_("n")):
               return False
 
=== modified file 'do-partial-upgrade'
--- do-partial-upgrade	2012-06-28 19:22:04 +0000
+++ do-partial-upgrade	2014-04-08 08:32:01 +0000
@@ -25,15 +25,16 @@
 
 from __future__ import print_function
 
-from gi.repository import Gtk
-import gi
-gi.require_version("Gtk", "3.0")
-
 import os
 import sys
 
 from DistUpgrade.DistUpgradeVersion import VERSION
 from DistUpgrade.DistUpgradeController import DistUpgradeController
+from DistUpgrade.DistUpgradeConfigParser import DistUpgradeConfig
+from DistUpgrade.DistUpgradeMain import (
+    setup_logging,
+    setup_view,
+)
 import locale
 import gettext
 
@@ -41,9 +42,6 @@
 
 if __name__ == "__main__":
 
-    Gtk.init_check(sys.argv)
-    Gtk.Window.set_default_icon_name("system-software-update")
-
     #FIXME: Workaround a bug in optparser which doesn't handle unicode/str
     #       correctly, see http://bugs.python.org/issue4391
     #       Should be resolved by Python3
@@ -60,33 +58,48 @@
     except:
         pass
 
+    # gtk2 used to throw a exception when it failed to init the display,
+    # so back then it was safe to try to import the frontend and fallback
+    # to text if the import failed. this is no longer the case so we need
+    # do figure it out here :/
+    if "DISPLAY" in os.environ:
+        default_frontend = "DistUpgradeViewGtk3"
+    else:
+        default_frontend = "DistUpgradeViewText"
+
     # Begin parsing of options
     parser = OptionParser()
     parser.add_option ("-V", "--version", action="store_true",
                        dest="show_version", default=False,
                        help=_("Show version and exit"))
-    parser.add_option ("--data-dir", "", 
+    parser.add_option ("--data-dir", "", dest="datadir",
                        default="/usr/share/ubuntu-release-upgrader/",
                        help=_("Directory that contains the data files"))
-    parser.add_option ("-f", "--frontend", default="DistUpgradeViewText",
+    parser.add_option ("-f", "--frontend", default=default_frontend,
                        dest="frontend", 
                        help=_("Run the specified frontend"))
 
     (options, args) = parser.parse_args()
 
-    data_dir = os.path.normpath(options.data_dir)+"/"
+    datadir = os.path.normpath(options.datadir)+"/"
 
     if options.show_version:
         print("%s: version %s" % (os.path.basename(sys.argv[0]), VERSION))
         sys.exit(0)
 
-    module_name = "DistUpgrade." + options.frontend
-    module = __import__(module_name)
-    submodule = getattr(module, options.frontend)
-    view_class = getattr(submodule, options.frontend)
-    view = view_class(data_dir)
+    # we are by definition in partial upgrade mode
+    options.partial = True
+    config = DistUpgradeConfig(options.datadir)
+    logdir = setup_logging(options, config)
+    view = setup_view(options, config, logdir)
+
     if options.frontend == "DistUpgradeViewGtk3":
+        from gi.repository import Gtk
+        import gi
+        gi.require_version("Gtk", "3.0")
+        Gtk.init_check(sys.argv)
+        Gtk.Window.set_default_icon_name("system-software-update")
         view.label_title.set_markup("<b><big>%s</big></b>" %
                                     _("Running partial upgrade"))
-    controller = DistUpgradeController(view, datadir=data_dir)
+    controller = DistUpgradeController(view, datadir=datadir)
     controller.doPartialUpgrade()