Merge lp:~mterry/ubuntu-release-upgrader/pkexec into lp:ubuntu-release-upgrader

[Michael Terry]

This branch makes a few changes to make it easier to run pkexec when doing a release upgrade. It also separates out the code between update-manager and u-r-u slightly better.

This moves some code form u-m to here (that really should have been here, there will be a follow-on branch to drop that stuff from u-m).

It adds a policykit file to provide nice translated user strings when running pkexec on a u-r-u file.

It adds better support for running do-release-upgrade with a GTK frontend.

It adds a new command do-partial-upgrade, which does what update-manager does when it detected a partial upgrade is necessary. I've broken it out here into a new command so that it can more easily be recognized by pkexec and so because the code it used was all from DistUpgrade anyway.

[Serge Hallyn (serge-hallyn)]

I see no obvious gotchas, looks good to me, thanks.

review: Approve

=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2012-06-28 16:12:09 +0000
+++ DistUpgrade/DistUpgradeController.py	2012-06-28 19:27:18 +0000
@@ -101,9 +101,6 @@
         if datadir == None:
             datadir = os.getcwd()
             localedir = os.path.join(datadir,"mo")
-        else:
-            # FIXME: don't overwrite this, once we move caller from u-m to us
-            datadir = "/usr/share/ubuntu-release-upgrader/"
         self.datadir = datadir
         self.options = options
 

=== modified file 'DistUpgrade/DistUpgradeFetcher.py'
--- DistUpgrade/DistUpgradeFetcher.py	2012-06-28 16:12:09 +0000
+++ DistUpgrade/DistUpgradeFetcher.py	2012-06-28 19:27:18 +0000
@@ -42,8 +42,6 @@
 
     def __init__(self, new_dist, progress, parent, datadir):
         DistUpgradeFetcherCore.__init__(self, new_dist, progress)
-        # TODO don't override this once we move callers from u-m to u-r-u
-        datadir = "/usr/share/ubuntu-release-upgrader/"
         uifile = datadir + "gtkbuilder/ReleaseNotes.ui"
         self.widgets = SimpleGtkbuilderApp(uifile, "ubuntu-release-upgrader")
         self.window_main = parent
@@ -98,9 +96,10 @@
         # FIXME: care about i18n! (append -$lang or something)
         if self.new_dist.releaseNotesURI is not None:
             uri = self._expandUri(self.new_dist.releaseNotesURI)
-            self.window_main.set_sensitive(False)
-            self.window_main.get_window().set_cursor(
-                Gdk.Cursor.new(Gdk.CursorType.WATCH))
+            if self.window_main:
+                self.window_main.set_sensitive(False)
+                self.window_main.get_window().set_cursor(
+                    Gdk.Cursor.new(Gdk.CursorType.WATCH))
             while Gtk.events_pending():
                 Gtk.main_iteration()
 
@@ -146,8 +145,9 @@
                 dialog.run()
                 dialog.destroy()
             socket.setdefaulttimeout(timeout)
-            self.window_main.set_sensitive(True)
-            self.window_main.get_window().set_cursor(None)
+            if self.window_main:
+                self.window_main.set_sensitive(True)
+                self.window_main.get_window().set_cursor(None)
             # user clicked cancel
             if res == Gtk.ResponseType.OK:
                 return True

=== modified file 'DistUpgrade/DistUpgradeViewGtk3.py'
--- DistUpgrade/DistUpgradeViewGtk3.py	2012-06-28 16:12:09 +0000
+++ DistUpgrade/DistUpgradeViewGtk3.py	2012-06-28 19:27:18 +0000
@@ -400,8 +400,6 @@
             localedir=os.path.join(os.getcwd(),"mo")
             gladedir=os.getcwd()
         else:
-            # FIXME: don't overwrite this, once we move caller from u-m to us
-            datadir = "/usr/share/ubuntu-release-upgrader/"
             localedir="/usr/share/locale/"
             gladedir=os.path.join(datadir, "gtkbuilder")
 

=== added file 'DistUpgrade/GtkProgress.py'
--- DistUpgrade/GtkProgress.py	1970-01-01 00:00:00 +0000
+++ DistUpgrade/GtkProgress.py	2012-06-28 19:27:18 +0000
@@ -0,0 +1,97 @@
+# 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 UpdateManager.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, "ubuntu-release-upgrader")
+        # 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

=== renamed file 'DistUpgrade/DistUpgrade.cfg' => 'data/DistUpgrade.cfg'
=== renamed file 'DistUpgrade/DistUpgrade.cfg.dapper' => 'data/DistUpgrade.cfg.dapper'
=== renamed file 'DistUpgrade/DistUpgrade.cfg.hardy' => 'data/DistUpgrade.cfg.hardy'
=== renamed file 'DistUpgrade/DistUpgrade.cfg.lucid' => 'data/DistUpgrade.cfg.lucid'
=== renamed file 'DistUpgrade/additional_pkgs.cfg' => 'data/additional_pkgs.cfg'
=== added file 'data/com.ubuntu.release-upgrader.policy.in'
--- data/com.ubuntu.release-upgrader.policy.in	1970-01-01 00:00:00 +0000
+++ data/com.ubuntu.release-upgrader.policy.in	2012-06-28 19:27:18 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+<policyconfig>
+  <vendor>Ubuntu</vendor>
+  <vendor_url>http://www.ubuntu.com/</vendor_url>
+  <icon_name>system-software-update</icon_name>
+
+  <action id="com.ubuntu.release-upgrader.release-upgrade">
+    <_description>Perform a release upgrade</_description>
+    <_message>Authentication is required to perform a release upgrade</_message>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/do-release-upgrade</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+
+    <defaults>
+      <allow_any>no</allow_any>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+  </action>
+
+  <action id="com.ubuntu.release-upgrader.partial-upgrade">
+    <_description>Perform a partial upgrade</_description>
+    <_message>Authentication is required to perform a partial upgrade</_message>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/lib/ubuntu-release-upgrader/do-partial-upgrade</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+
+    <defaults>
+      <allow_any>no</allow_any>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+  </action>
+  
+</policyconfig>

=== renamed symlink 'DistUpgrade/demoted.cfg' => 'data/demoted.cfg'
=== added file 'data/gtkbuilder/AcquireProgress.ui'
--- data/gtkbuilder/AcquireProgress.ui	1970-01-01 00:00:00 +0000
+++ data/gtkbuilder/AcquireProgress.ui	2012-06-28 19:27:18 +0000
@@ -0,0 +1,161 @@
+<?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>

=== renamed file 'DistUpgrade/mirrors.cfg' => 'data/mirrors.cfg'
=== renamed file 'DistUpgrade/removal_blacklist.cfg' => 'data/removal_blacklist.cfg'
=== modified file 'debian/ubuntu-release-upgrader-core.install'
--- debian/ubuntu-release-upgrader-core.install	2012-06-13 18:08:14 +0000
+++ debian/ubuntu-release-upgrader-core.install	2012-06-28 19:27:18 +0000
@@ -2,6 +2,8 @@
 debian/tmp/etc/update-manager/*
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/ubuntu-release-upgrader/*.cfg
+debian/tmp/usr/share/polkit-1/actions
+debian/tmp/usr/bin/do-partial-upgrade    /usr/lib/ubuntu-release-upgrader
 debian/release-upgrade-motd usr/lib/ubuntu-release-upgrader
 debian/91-release-upgrade etc/update-motd.d/
 debian/source_ubuntu-release-upgrader.py /usr/share/apport/package-hooks/

=== added file 'do-partial-upgrade'
--- do-partial-upgrade	1970-01-01 00:00:00 +0000
+++ do-partial-upgrade	2012-06-28 19:27:18 +0000
@@ -0,0 +1,92 @@
+#!/usr/bin/python3
+# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
+#  
+#  Copyright (c) 2004-2012 Canonical
+#                2004-2008 Michael Vogt
+#                2004 Michiel Sikkes
+#  
+#  Author: Michiel Sikkes <[e-mail]>
+#          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 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
+import locale
+import gettext
+
+from optparse import OptionParser
+
+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
+    gettext.bindtextdomain("ubuntu-release-upgrader", "/usr/share/locale")
+    gettext.textdomain("ubuntu-release-upgrader")
+    translation = gettext.translation("ubuntu-release-upgrader", fallback=True)
+    if sys.version >= '3':
+        _ = translation.gettext
+    else:
+        _ = translation.ugettext
+
+    try:
+        locale.setlocale(locale.LC_ALL, "")
+    except:
+        pass
+
+    # 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", "", 
+                       default="/usr/share/ubuntu-release-upgrader/",
+                       help=_("Directory that contains the data files"))
+    parser.add_option ("-f", "--frontend", default="DistUpgradeViewText",
+                       dest="frontend", 
+                       help=_("Run the specified frontend"))
+
+    (options, args) = parser.parse_args()
+
+    data_dir = os.path.normpath(options.data_dir)+"/"
+
+    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)
+    if options.frontend == "DistUpgradeViewGtk3":
+        view.label_title.set_markup("<b><big>%s</big></b>" %
+                                    _("Running partial upgrade"))
+    controller = DistUpgradeController(view, datadir=data_dir)
+    controller.doPartialUpgrade()

=== modified file 'do-release-upgrade'
--- do-release-upgrade	2012-06-28 16:12:09 +0000
+++ do-release-upgrade	2012-06-28 19:27:18 +0000
@@ -4,12 +4,10 @@
 
 import warnings
 warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning)
-import apt
 
 from DistUpgrade.DistUpgradeVersion import VERSION
 
 from UpdateManager.Core.MetaRelease import MetaReleaseCore
-from DistUpgrade.DistUpgradeFetcherCore import DistUpgradeFetcherCore
 from optparse import OptionParser
 import locale
 import gettext
@@ -22,6 +20,26 @@
 RELEASE_AVAILABLE=0
 NO_RELEASE_AVAILABLE=1
 
+
+def get_fetcher(frontend, new_dist, datadir):
+    if frontend == "DistUpgradeViewGtk3":
+        from DistUpgrade.DistUpgradeFetcher import DistUpgradeFetcherGtk
+        from DistUpgrade.GtkProgress import GtkAcquireProgress
+        progress = GtkAcquireProgress(
+            None,
+            datadir,
+            _("Downloading the release upgrade tool"))
+        return DistUpgradeFetcherGtk(new_dist=new_dist,
+                                     progress=progress,
+                                     parent=None,
+                                     datadir=datadir)
+    else:
+        from DistUpgrade.DistUpgradeFetcherCore import DistUpgradeFetcherCore
+        import apt
+        progress = apt.progress.text.AcquireProgress()
+        return DistUpgradeFetcherCore
+
+
 if __name__ == "__main__":
 
   #FIXME: Workaround a bug in optparser which doesn't handle unicode/str
@@ -53,6 +71,9 @@
                      dest="devel_release", default=False,
                      help=_("Check if upgrading to the latest devel release "
                           "is possible"))
+  parser.add_option ("--data-dir", "", 
+                     default="/usr/share/ubuntu-release-upgrader/",
+                     help=_("Directory that contains the data files"))
   parser.add_option ("-p", "--proposed", action="store_true",
                      dest="proposed_release", default=False,
                      help=_("Try upgrading to the latest release using "
@@ -120,9 +141,7 @@
     print(_("Run 'do-release-upgrade' to upgrade to it."))
     sys.exit(RELEASE_AVAILABLE)
 
-  progress = apt.progress.text.AcquireProgress()
-  fetcher = DistUpgradeFetcherCore(new_dist=m.new_dist,
-                                   progress=progress)
+  fetcher = get_fetcher(options.frontend, m.new_dist, options.data_dir)
   fetcher.run_options += ["--mode=%s" % options.mode,
                           "--frontend=%s" % options.frontend,
                           ]

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-06-28 16:12:09 +0000
+++ po/POTFILES.in	2012-06-28 19:27:18 +0000
@@ -14,10 +14,14 @@
 DistUpgrade/DistUpgradeViewKDE.py
 DistUpgrade/DistUpgradeView.py
 DistUpgrade/DistUpgradeViewText.py
+DistUpgrade/GtkProgress.py
 DistUpgrade/ReleaseNotesViewer.py
 DistUpgrade/ReleaseNotesViewerWebkit.py
+[type: gettext/glade]data/gtkbuilder/AcquireProgress.ui
 [type: gettext/glade]data/gtkbuilder/DistUpgrade.ui
 [type: gettext/glade]data/gtkbuilder/ReleaseNotes.ui
 [type: gettext/glade]data/gtkbuilder/UpgradePromptDialog.ui
+[type: gettext/xml]data/com.ubuntu.release-upgrader.policy.in
+do-partial-upgrade
 do-release-upgrade
 check-new-release-gtk

=== modified file 'pre-build.sh'
--- pre-build.sh	2012-06-22 00:41:25 +0000
+++ pre-build.sh	2012-06-28 19:27:18 +0000
@@ -34,7 +34,7 @@
 
 # cleanup
 rm -rf utils/apt/lists utils/apt/*.bin
-(cd utils && ./update_mirrors.py ../DistUpgrade/mirrors.cfg)
+(cd utils && ./update_mirrors.py ../data/mirrors.cfg)
 
 # run the test-suit
 #echo "Running integrated tests"

=== modified file 'setup.cfg'
--- setup.cfg	2012-06-06 21:23:35 +0000
+++ setup.cfg	2012-06-28 19:27:18 +0000
@@ -1,5 +1,6 @@
 [build_i18n]
 domain=ubuntu-release-upgrader
+xml-files=[("share/polkit-1/actions", ["data/com.ubuntu.release-upgrader.policy.in"]),]
 
 [sdist]
 formats = bztar

=== modified file 'setup.py'
--- setup.py	2012-06-28 16:12:09 +0000
+++ setup.py	2012-06-28 19:27:18 +0000
@@ -23,6 +23,7 @@
                 'DistUpgrade',
                 ],
       scripts=[
+               "do-partial-upgrade",
                "do-release-upgrade",
                "kubuntu-devel-release-upgrade",
                "check-new-release-gtk",
@@ -32,7 +33,7 @@
                    glob.glob("data/gtkbuilder/*.ui")
                   ),
                   ('share/ubuntu-release-upgrader/',
-                   glob.glob("DistUpgrade/*.cfg")+
+                   glob.glob("data/*.cfg")+
                    glob.glob("DistUpgrade/*.ui")
                   ),
                   ('share/man/man8',