Merge lp:~mterry/update-manager/pkexec into lp:update-manager

[Michael Terry]

This is the other half of https://code.launchpad.net/~mterry/ubuntu-release-upgrader/pkexec/+merge/112638

It uses pkexec instead of gksu and moves some release upgrade specific code out of lil old update-manager.

[Serge Hallyn (serge-hallyn)]

Looks good to me, as far as my u-m-untrained eyes can see.

review: Approve

=== modified file 'UpdateManager/Dialogs.py'
--- UpdateManager/Dialogs.py	2012-06-28 16:15:24 +0000
+++ UpdateManager/Dialogs.py	2012-06-28 19:34:26 +0000
@@ -36,8 +36,6 @@
 import sys
 import time
 from .SimpleGtk3builderApp import SimpleGtkbuilderApp
-from DistUpgrade.DistUpgradeFetcher import DistUpgradeFetcherGtk
-from .GtkProgress import GtkAcquireProgress
 
 from gettext import gettext as _
 
@@ -130,18 +128,9 @@
         self.focus_button = self.add_button(Gtk.STOCK_OK, self.close)
 
     def upgrade(self):
-        progress = GtkAcquireProgress(
-            self.window_main,
-            self.window_main.datadir,
-            _("Downloading the release upgrade tool"))
-        fetcher = DistUpgradeFetcherGtk(
-            new_dist=self.meta_release.upgradable_to,
-            parent=self.window_main,
-            progress=progress,
-            datadir=self.window_main.datadir)
-        if self.window_main.options.sandbox:
-            fetcher.run_options.append("--sandbox")
-        fetcher.run()
+        os.execl("/usr/bin/pkexec",
+                 "/usr/bin/pkexec", "/usr/bin/do-release-upgrade",
+                 "--frontend=DistUpgradeViewGtk3")
 
 
 class UnsupportedDialog(DistUpgradeDialog):
@@ -179,10 +168,10 @@
         self.focus_button = self.add_button(_("_Continue"), Gtk.main_quit)
 
     def upgrade(self):
-        os.execl("/usr/bin/gksu",
-                 "/usr/bin/gksu", "--desktop",
-                 "/usr/share/applications/update-manager.desktop",
-                 "--", "/usr/bin/update-manager", "--dist-upgrade")
+        os.execl("/usr/bin/pkexec",
+                 "/usr/bin/pkexec",
+                 "/usr/lib/ubuntu-release-upgrader/do-partial-upgrade",
+                 "--frontend=DistUpgradeViewGtk3")
 
     def main(self):
         Dialog.main(self)

=== removed file 'UpdateManager/GtkProgress.py'
--- UpdateManager/GtkProgress.py	2012-06-28 00:09:03 +0000
+++ UpdateManager/GtkProgress.py	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-# GtkProgress.py
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-#  Copyright (c) 2004,2005 Canonical
-#
-#  Author: Michael Vogt <[e-mail]>
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License as
-#  published by the Free Software Foundation; either version 2 of the
-#  License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-#  USA
-
-from __future__ import absolute_import, print_function
-
-from gi.repository import Gtk, Gdk
-import apt
-from gettext import gettext as _
-from .Core.utils import humanize_size
-from .SimpleGtk3builderApp import SimpleGtkbuilderApp
-
-
-class GtkAcquireProgress(apt.progress.base.AcquireProgress):
-    def __init__(self, parent, datadir, summary="", descr=""):
-        uifile = datadir + "gtkbuilder/AcquireProgress.ui"
-        self.widgets = SimpleGtkbuilderApp(uifile, "update-manager")
-        # if this is set to false the download will cancel
-        self._continue = True
-        # init vars here
-        # FIXME: find a more elegant way, this sucks
-        self.summary = self.widgets.label_fetch_summary
-        self.status = self.widgets.label_fetch_status
-        # we need to connect the signal manual here, it won't work
-        # from the main window auto-connect
-        self.widgets.button_fetch_cancel.connect(
-            "clicked", self.on_button_fetch_cancel_clicked)
-        self.progress = self.widgets.progressbar_fetch
-        self.window_fetch = self.widgets.window_fetch
-        self.window_fetch.set_transient_for(parent)
-        self.window_fetch.realize()
-        self.window_fetch.get_window().set_functions(Gdk.WMFunction.MOVE)
-        # set summary
-        if summary != "":
-            self.summary.set_markup("<big><b>%s</b></big> \n\n%s" %
-                                    (summary, descr))
-
-    def start(self):
-        self.progress.set_fraction(0)
-        self.window_fetch.show()
-
-    def stop(self):
-        self.window_fetch.hide()
-
-    def on_button_fetch_cancel_clicked(self, widget):
-        self._continue = False
-
-    def pulse(self, owner):
-        apt.progress.base.AcquireProgress.pulse(self, owner)
-        current_item = self.current_items + 1
-        if current_item > self.total_items:
-            current_item = self.total_items
-        if self.current_cps > 0:
-            status_text = (_("Downloading file %(current)li of %(total)li "
-                             "with %(speed)s/s") % {
-                                 "current": current_item,
-                                 "total": self.total_items,
-                                 "speed": humanize_size(self.current_cps)})
-        else:
-            status_text = (_("Downloading file %(current)li of %(total)li") %
-                           {"current": current_item,
-                            "total": self.total_items})
-            self.progress.set_fraction(
-                (self.current_bytes + self.current_items) /
-                float(self.total_bytes + self.total_items))
-        self.status.set_markup("<i>%s</i>" % status_text)
-        # TRANSLATORS: show the remaining time in a progress bar:
-        #if self.current_cps > 0:
-        #    eta = ((self.total_bytes + self.current_bytes) /
-        #           float(self.current_cps))
-        #else:
-        #    eta = 0.0
-        #self.progress.set_text(_("About %s left" % (apt_pkg.TimeToStr(eta))))
-        # FIXME: show remaining time
-        self.progress.set_text("")
-
-        while Gtk.events_pending():
-            Gtk.main_iteration()
-        return self._continue

=== modified file 'UpdateManager/backend/InstallBackendSynaptic.py'
--- UpdateManager/backend/InstallBackendSynaptic.py	2012-06-28 00:10:23 +0000
+++ UpdateManager/backend/InstallBackendSynaptic.py	2012-06-28 19:34:26 +0000
@@ -26,9 +26,7 @@
             xid = win.get_xid()
         except AttributeError:
             xid = 0
-        cmd = ["/usr/bin/gksu",
-               "--desktop", "/usr/share/applications/update-manager.desktop",
-               "--", "/usr/sbin/synaptic", "--hide-main-window",
+        cmd = ["/usr/bin/pkexec",  "/usr/sbin/synaptic", "--hide-main-window",
                "--non-interactive", "--parent-window-id",
                "%s" % xid]
         cmd.extend(opt)

=== removed file 'data/gtkbuilder/AcquireProgress.ui'
--- data/gtkbuilder/AcquireProgress.ui	2012-06-15 20:02:33 +0000
+++ data/gtkbuilder/AcquireProgress.ui	1970-01-01 00:00:00 +0000
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkWindow" id="window_fetch">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">400</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <child>
-      <object class="GtkVBox" id="pane_fetch">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkVBox" id="vbox7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">6</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkLabel" id="label_fetch_summary">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="use_markup">True</property>
-                <property name="wrap">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="vbox8">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkProgressBar" id="progressbar_fetch">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="pulse_step">0.10000000149</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_fetch_status">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkExpander" id="expander1">
-                <property name="can_focus">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkVBox" id="vbox9">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow6">
-                        <property name="height_request">200</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <object class="GtkTreeView" id="treeview1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="enable_search">False</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="treeview-selection"/>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label19">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Show progress of individual files</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox7">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button_fetch_cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="border_width">5</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

=== modified file 'debian/control'
--- debian/control	2012-06-28 16:15:24 +0000
+++ debian/control	2012-06-28 19:34:26 +0000
@@ -50,7 +50,7 @@
 Depends: ${python3:Depends}, ${misc:Depends}, 
          update-manager-core (= ${source:Version}),
          python3-aptdaemon.gtk3widgets (>= 0.40) | synaptic, 
-         gksu,
+         policykit-1,
          python3-dbus,
          python3-gi,
          gir1.2-vte-2.90, 

=== modified file 'debian/update-manager.install'
--- debian/update-manager.install	2012-06-28 16:15:24 +0000
+++ debian/update-manager.install	2012-06-28 19:34:26 +0000
@@ -8,7 +8,6 @@
 debian/tmp/usr/share/applications/update-manager.desktop
 debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/ChangelogViewer.py
 debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/Dialogs.py
-debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/GtkProgress.py
 debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/InstallProgress.py
 debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/MetaReleaseGObject.py
 debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/UpdateManager.py

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-06-28 16:15:24 +0000
+++ po/POTFILES.in	2012-06-28 19:34:26 +0000
@@ -3,7 +3,6 @@
 UpdateManager/ChangelogViewer.py
 UpdateManager/MetaReleaseGObject.py
 UpdateManager/Dialogs.py
-UpdateManager/GtkProgress.py
 UpdateManager/InstallProgress.py
 UpdateManager/UpdateManager.py
 UpdateManager/UpdateProgress.py
@@ -14,7 +13,6 @@
 UpdateManager/Core/UpdateList.py
 UpdateManager/Core/MetaRelease.py
 UpdateManager/Core/utils.py
-[type: gettext/glade]data/gtkbuilder/AcquireProgress.ui
 [type: gettext/glade]data/gtkbuilder/Dialog.ui
 [type: gettext/glade]data/gtkbuilder/UpdateManager.ui
 [type: gettext/glade]data/gtkbuilder/UpdateProgress.ui

=== modified file 'update-manager'
--- update-manager	2012-06-25 15:38:35 +0000
+++ update-manager	2012-06-28 19:34:26 +0000
@@ -88,9 +88,6 @@
                      # input focus control when it is displayed for the
                      # first time (see also the gtk devhelp page)
                      help=_("Do not focus on map when starting"))
-  parser.add_option ("--dist-upgrade", action="store_true",
-                     dest="dist_upgrade", default=False,
-                     help=_("Try to run a dist-upgrade"))
   parser.add_option ("--no-update", action="store_true",
                      dest="no_update", default=False,
                      help=_("Do not check for updates when starting"))
@@ -109,23 +106,11 @@
     print("%s: version %s" % (os.path.basename(sys.argv[0]), VERSION))
     sys.exit(0)
 
-  if options.dist_upgrade == True:
-    #import logging
-    #logging.basicConfig(level=logging.DEBUG)
-    from DistUpgrade.DistUpgradeViewGtk3 import DistUpgradeViewGtk3
-    from DistUpgrade.DistUpgradeController import DistUpgradeController
-    # FIXME: Having a "partial upgrade" view here would make it possible
-    #        to get rid of the ugly hideStep() stuff
-    view = DistUpgradeViewGtk3(data_dir)
-    view.label_title.set_markup("<b><big>%s</big></b>" % _("Running partial upgrade"))
-    controller = DistUpgradeController(view, datadir=data_dir)
-    controller.doPartialUpgrade()
-  else:
-    # keep track when we run (for update-notifier)
-    settings =  Gio.Settings("com.ubuntu.update-manager")
-    settings.set_int("launch-time", int(time.time()))
-    init_proxy(settings)
+  # keep track when we run (for update-notifier)
+  settings =  Gio.Settings("com.ubuntu.update-manager")
+  settings.set_int("launch-time", int(time.time()))
+  init_proxy(settings)
 
-    app = UpdateManager(data_dir, options)
-    app.start_update()
-    Gtk.main()
+  app = UpdateManager(data_dir, options)
+  app.start_update()
+  Gtk.main()