Merge lp:~ubuntu-core-dev/ubuntu-release-upgrader/split into lp:ubuntu-release-upgrader

[Michael Terry]

As discussed at UDS, we wanted to split out the release upgrade code from update-manager to its own source package.

This is my attempt at doing so. I'm not *super* familiar with the code, so I may have made a mistake but for the most part it was straightforward.

Some notes:
 * This still uses some UpdateManager imports, so we hard-dep on update-manager.
 * This still uses a couple keys from update-manager's gsettings schema. It didn't seem worth the pain of transitioning.
 * This still uses the same /etc/update-manager location that update-manager did (although all files under that directory are really owned by this package now). I used appropriate Breaks/Replaces lines, but didn't bother renaming the directory. It didn't seem worth the effort, especially since we'd also have to migrate user files in /etc/update-manager/release-upgrades.d/
 * I re-enabled some tests that had been dormant (chmod +x)
 * A couple apport-oriented Python bits pretend to be /usr/bin/update-manager. I changed those to pretend to be /usr/bin/do-release-upgrade.
 * I split packages into core/gtk/qt, matching what they were in update-manager, although the frontend packages are real tiny.

[lp:~ubuntu-core-dev/ubuntu-release-upgrader/split]

2457. By Michael Terry on 2012-06-13

merge from lp:update-manager

2458. By Michael Terry on 2012-06-13

split package into python-* modules too

2459. By Michael Terry on 2012-06-13

drop python2 module and have the core depend on the python3 module

2460. By Michael Terry on 2012-06-14

bump version of update-manager to Break because they just released a new one

[Barry Warsaw (barry)]

Diff against target: 224858 lines (+111053/-13464) 238 files modified (has conflicts)

Ouch! I'm guessing the branch is out of date with the latest trunk of update-manager. Could you take a look at updating your branch, hopefully reducing the diff lines and resolving the conflicts? Thanks!

review: Needs Fixing

[lp:~ubuntu-core-dev/ubuntu-release-upgrader/split]

2461. By Michael Terry on 2012-06-25

merge from trunk again

2462. By Michael Terry on 2012-06-27

merge from trunk

[Michael Terry (mterry)]

Updated to match latest update-manager trunk again.

[Ken VanDine (ken-vandine)]

The symlinks to files included in python-update-manager should probably be removed. That is a temporary package, better to fix the imports.

review: Needs Fixing

[lp:~ubuntu-core-dev/ubuntu-release-upgrader/split]

2463. By Michael Terry on 2012-06-27

drop some added files from UpdateManager merge

2464. By Michael Terry on 2012-06-27

drop any symlink dependencies on UpdateManager and make them real imports; copy a couple tiny classes from the UI part of UpdateManager here

[Ken VanDine (ken-vandine)]

Tests are still failing, it looks like some of the update manager specific tests are still there and probably just need to be removed.

./test_meta_release_core.py
Traceback (most recent call last):
  File "./test_meta_release_core.py", line 45, in <module>
    from DistUpgrade.MetaRelease import MetaReleaseCore, Dist
ImportError: No module named MetaRelease

review: Needs Fixing

[lp:~ubuntu-core-dev/ubuntu-release-upgrader/split]

2465. By Michael Terry on 2012-06-27

more import fixes

[Ken VanDine (ken-vandine)]

All tests that are expected to pass are passing. Looks good now that the symlinks are fixed up.

review: Approve

[lp:~ubuntu-core-dev/ubuntu-release-upgrader/split]

2466. By Michael Terry on 2012-06-27

fix versions of update-manager that we Break, the other branch got merged earlier than I expected

=== removed file 'BUGS'
--- BUGS	2006-09-11 08:13:06 +0000
+++ BUGS	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-* aptsources.py:
-- when turning off a new sources.list entry for the runing distro 
-  (e.g. multiverse in a full edgy) and it is turned on again, the
-  source code checkbox becomes only half-checked
-- when turning off/on a entry the comments become disordered

=== removed file 'ChangeLog'
--- ChangeLog	2005-11-15 13:18:07 +0000
+++ ChangeLog	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-2005-04-04  Michael Vogt <[e-mail]>
-
-        * configure.in: Added "xh" to ALL_LINGUAS.
-
-2005-04-01  Steve Murphy  <[e-mail]>
-
-        * configure.in: Added "rw" to ALL_LINGUAS.
-
-2005-03-29  Raphael Higino  <[e-mail]>
-
-	* configure.in: Added pt_BR to ALL_LINGUAS.
-
-2005-03-29  Zygmunt Krynicki  <[e-mail]>
-
-       * src/dialog_apt_key.py.in: Enabled translation of known keys
-
-2005-03-24  Michiel Sikkes  <[e-mail]>
-
-	* data/update-manager.glade: Added help button. Put package count next
-	to reload button above updatelist.
-	* src/update-manager.in: Implemented help button.
-	* configure.in: Added ja to ALL_LINGUAS.
-
-2005-03-21  Adam Weinberger  <[e-mail]>
-
-	* configure.in: Added en_CA to ALL_LINGUAS.
-
-2005-03-21  Christian Rose  <[e-mail]>
-
-	* configure.in: Added "sv" to ALL_LINGUAS.
-	Also sorted the language entries in the ALL_LINGUAS line,
-	so that it will be possible to spot duplicates or omissions.
-
-2005-03-11  Michiel Sikkes  <[e-mail]>
-
-	* configure.in: Added el (Greek) to ALL_LINGUAS.
-
-2005-03-03  Dan Damian  <[e-mail]>
-
-	* configure.in: Added ro (Romanian) to ALL_LINGUAS.
-
-2005-03-10  Zygmunt Krynicki <[e-mail]>
-
-	* Improved translation support
-
-2005-02-18  Michiel Sikkes  <[e-mail]>
-
-	* Added window title to the synaptic gtk socket window.
-
-2005-02-18  Michiel Sikkes  <[e-mail]>
-
-	* Updated strings to have more consistent messages and it's not a pain
-	in the ass to translate ;).
-	* Merge from branches/release-37-2.
-
-2005-01-27  Martin Willemoes Hansen  <[e-mail]>
-
-	* da.po: Added Danish translation.
-
-2004-10-25  Michiel Sikkes  <[e-mail]>
-
-	* Initial release.

=== modified file 'DistUpgrade/DistUpgradeApport.py'
--- DistUpgrade/DistUpgradeApport.py	2012-06-18 18:41:13 +0000
+++ DistUpgrade/DistUpgradeApport.py	2012-06-27 19:25:24 +0000
@@ -15,11 +15,11 @@
     except ImportError as e:
         logging.error("failed to import apport python module, can't report bug: %s" % e)
         return False
-    # we pretend we are update-manager
-    sys.argv[0] = "/usr/bin/update-manager"
+    # we pretend we are do-release-upgrade
+    sys.argv[0] = "/usr/bin/do-release-upgrade"
     apport_excepthook(type, value, tb)
     # now add the files in /var/log/dist-upgrade/*
-    if os.path.exists('/var/crash/_usr_bin_update-manager.0.crash'):
+    if os.path.exists('/var/crash/_usr_bin_do-release-upgrade.0.crash'):
         report = Report()
         report.setdefault('Tags', 'dist-upgrade')
         report['Tags'] += ' dist-upgrade'
@@ -28,7 +28,7 @@
             if not os.path.isfile(f) or os.path.getsize(f) == 0:
                 continue
             report[f.replace(".", "").replace("-", "")] = (open(f), )
-        report.add_to_existing('/var/crash/_usr_bin_update-manager.0.crash')
+        report.add_to_existing('/var/crash/_usr_bin_do-release-upgrade.0.crash')
     return True
 
 

=== modified file 'DistUpgrade/DistUpgradeCache.py'
--- DistUpgrade/DistUpgradeCache.py	2012-06-13 12:45:49 +0000
+++ DistUpgrade/DistUpgradeCache.py	2012-06-27 19:25:24 +0000
@@ -40,7 +40,7 @@
 from .DistUpgradeGettext import gettext as _
 from .DistUpgradeGettext import ngettext
 
-from .utils import inside_chroot, estimate_kernel_size_in_boot
+from UpdateManager.Core.utils import inside_chroot, estimate_kernel_size_in_boot
 
 class CacheException(Exception):
     pass
@@ -704,7 +704,7 @@
                              "please try again later.")
             else:
                 details += _("If none of this applies, then please report this bug using "
-                             "the command 'ubuntu-bug update-manager' in a terminal.")
+                             "the command 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal.")
             # make the error text available again on stdout for the
             # text frontend
             self._stopAptResolverLog()
@@ -915,7 +915,7 @@
                                    _("It was impossible to install a "
                                      "required package. Please report "
                                      "this as a bug using "
-                                     "'ubuntu-bug update-manager' in "
+                                     "'ubuntu-bug ubuntu-release-upgrader-core' in "
                                      "a terminal."))
                         return False
                     logging.debug("marked_install: '%s' -> '%s'" % (key, self[key].marked_install))

=== modified file 'DistUpgrade/DistUpgradeConfigParser.py'
--- DistUpgrade/DistUpgradeConfigParser.py	2012-06-11 10:46:56 +0000
+++ DistUpgrade/DistUpgradeConfigParser.py	2012-06-27 19:25:24 +0000
@@ -16,7 +16,7 @@
 import logging
 import glob
 
-CONFIG_OVERRIDE_DIR =  "/etc/update-manager/release-upgrades.d"
+CONFIG_OVERRIDE_DIR =  "/etc/ubuntu-release-upgrader/release-upgrades.d"
 
 class DistUpgradeConfig(SafeConfigParser):
     def __init__(self, datadir, name="DistUpgrade.cfg", 

=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2012-06-11 12:09:52 +0000
+++ DistUpgrade/DistUpgradeController.py	2012-06-27 19:25:24 +0000
@@ -45,14 +45,14 @@
 except ImportError:
     # < 3.0
     from ConfigParser import SafeConfigParser, NoOptionError
-from .utils import (country_mirror,
-                    url_downloadable,
-                    check_and_fix_xbit,
-                    get_arch,
-                    iptables_active,
-                    inside_chroot,
-                    get_string_with_no_auth_from_source_entry,
-                    is_child_of_process_name)
+from UpdateManager.Core.utils import (country_mirror,
+                                      url_downloadable,
+                                      check_and_fix_xbit,
+                                      get_arch,
+                                      iptables_active,
+                                      inside_chroot,
+                                      get_string_with_no_auth_from_source_entry,
+                                      is_child_of_process_name)
 from string import Template
 try:
     from urllib.parse import urlsplit
@@ -105,8 +105,8 @@
         self.options = options
 
         # init gettext
-        gettext.bindtextdomain("update-manager",localedir)
-        gettext.textdomain("update-manager")
+        gettext.bindtextdomain("ubuntu-release-upgrader",localedir)
+        gettext.textdomain("ubuntu-release-upgrader")
 
         # setup the view
         logging.debug("Using '%s' view" % distUpgradeView.__class__.__name__)
@@ -305,7 +305,7 @@
             and we have network - we will then try to fetch a update
             of ourself
         """  
-        from .MetaRelease import MetaReleaseCore
+        from UpdateManager.Core.MetaRelease import MetaReleaseCore
         from .DistUpgradeFetcherSelf import DistUpgradeFetcherSelf
         # check if we run from a LTS 
         forceLTS=False
@@ -534,7 +534,7 @@
                         # we replace the sources.list with a single
                         # line to ubuntu-main
                         logging.warning('get_distro().enable_component("man") failed, overwriting sources.list instead as last resort')
-                        s =  "# auto generated by update-manager"
+                        s =  "# auto generated by ubuntu-release-upgrader"
                         s += "deb http://archive.ubuntu.com/ubuntu %s main restricted" % self.toDist
                         s += "deb http://archive.ubuntu.com/ubuntu %s-updates main restricted" % self.toDist
                         s += "deb http://security.ubuntu.com/ubuntu %s-security main restricted" % self.toDist
@@ -771,7 +771,7 @@
                              _("Upgrading the repository information "
                                "resulted in a invalid file so a bug "
                                "reporting process is being started."))
-            subprocess.Popen(["apport-bug", "update-manager"])
+            subprocess.Popen(["apport-bug", "ubuntu-release-upgrader"])
             return False
 
         if self.sources_disabled:
@@ -1083,8 +1083,8 @@
                 # if its a ordering bug we can cleanly revert to
                 # the previous release, no packages have been installed
                 # yet (LP: #328655, #356781)
-                if os.path.exists("/var/run/update-manager-apt-exception"):
-                    e = open("/var/run/update-manager-apt-exception").read()
+                if os.path.exists("/var/run/ubuntu-release-upgrader-apt-exception"):
+                    e = open("/var/run/ubuntu-release-upgrader-apt-exception").read()
                     logging.error("found exception: '%s'" % e)
                     # if its a ordering bug we can cleanly revert but we need to write
                     # a marker for the parent process to know its this kind of error
@@ -1111,7 +1111,7 @@
                 if not self._partialUpgrade:
                     if not run_apport():
                         msg += _("\n\nPlease report this bug in a browser at "
-                                 "http://bugs.launchpad.net/ubuntu/+source/update-manager/+filebug "
+                                 "http://bugs.launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+filebug "
                                  "and attach the files in /var/log/dist-upgrade/ "
                                  "to the bug report.\n"
                                  "%s" % e)
@@ -1594,7 +1594,7 @@
                              _("Preparing the system for the upgrade "
                                "failed so a bug reporting process is "
                                "being started."))
-            subprocess.Popen(["apport-bug", "update-manager"])
+            subprocess.Popen(["apport-bug", "ubuntu-release-upgrader"])
             sys.exit(1)
 
         # mvo: commented out for now, see #54234, this needs to be
@@ -1613,7 +1613,7 @@
                                    "\n"
                                    "Additionally, a bug reporting process is "
                                    "being started."))
-                subprocess.Popen(["apport-bug", "update-manager"])
+                subprocess.Popen(["apport-bug", "ubuntu-release-upgrader"])
                 self.abort()
 
         # run a "apt-get update" now, its ok to ignore errors, 
@@ -1684,7 +1684,7 @@
                                    "In the case of an overloaded mirror, you "
                                    "may want to try the upgrade again later.")
                                    % pkg)
-                subprocess.Popen(["apport-bug", "update-manager"])
+                subprocess.Popen(["apport-bug", "ubuntu-release-upgrader"])
                 self.abort()
 
         # calc the dist-upgrade and see if the removals are ok/expected

=== modified file 'DistUpgrade/DistUpgradeFetcherCore.py'
--- DistUpgrade/DistUpgradeFetcherCore.py	2012-05-28 10:20:51 +0000
+++ DistUpgrade/DistUpgradeFetcherCore.py	2012-06-27 19:25:24 +0000
@@ -33,7 +33,7 @@
 from gettext import gettext as _
 from aptsources.sourceslist import SourcesList
 
-from .utils import get_dist, url_downloadable, country_mirror
+from UpdateManager.Core.utils import get_dist, url_downloadable, country_mirror
 
 class DistUpgradeFetcherCore(object):
     " base class (without GUI) for the upgrade fetcher "
@@ -150,7 +150,7 @@
         if not os.path.exists(script):
             return self.error(_("Could not run the upgrade tool"),
                          _("Could not run the upgrade tool") + ".  " + _("This is most likely a bug in the upgrade tool. "
-                          "Please report it as a bug using the command 'ubuntu-bug update-manager'."))
+                          "Please report it as a bug using the command 'ubuntu-bug ubuntu-release-upgrader-core'."))
         return True
 
     def mirror_from_sources_list(self, uri, default_uri):
@@ -211,7 +211,7 @@
 
     def fetchDistUpgrader(self):
         " download the tarball with the upgrade script "
-        self.tmpdir = tmpdir = tempfile.mkdtemp(prefix="update-manager-")
+        self.tmpdir = tmpdir = tempfile.mkdtemp(prefix="ubuntu-release-upgrader-")
         os.chdir(tmpdir)
         logging.debug("using tmpdir: '%s'" % tmpdir)
         # turn debugging on here (if required)

=== modified file 'DistUpgrade/DistUpgradeQuirks.py'
--- DistUpgrade/DistUpgradeQuirks.py	2012-06-12 01:00:52 +0000
+++ DistUpgrade/DistUpgradeQuirks.py	2012-06-27 19:25:24 +0000
@@ -34,7 +34,7 @@
 from subprocess import PIPE, Popen
 from hashlib import md5
 
-from .utils import lsmod, get_arch
+from UpdateManager.Core.utils import lsmod, get_arch
 
 from .DistUpgradeGettext import gettext as _
 from janitor.plugincore.manager import PluginManager

=== modified file 'DistUpgrade/DistUpgradeView.py'
--- DistUpgrade/DistUpgradeView.py	2012-06-13 11:57:10 +0000
+++ DistUpgrade/DistUpgradeView.py	2012-06-27 19:25:24 +0000
@@ -206,7 +206,7 @@
       except Exception as e:
         print("Exception during pm.DoInstall(): ", e)
         logging.exception("Exception during pm.DoInstall()")
-        open("/var/run/update-manager-apt-exception","w").write(str(e))
+        open("/var/run/ubuntu-release-upgrader-apt-exception","w").write(str(e))
         os._exit(pm.ResultFailed)
       os._exit(res)
     self.child_pid = pid

=== modified file 'DistUpgrade/DistUpgradeViewGtk.py'
--- DistUpgrade/DistUpgradeViewGtk.py	2012-06-13 11:40:17 +0000
+++ DistUpgrade/DistUpgradeViewGtk.py	2012-06-27 19:25:24 +0000
@@ -387,8 +387,8 @@
         gtk.init_check()
 
         try:
-          locale.bindtextdomain("update-manager",localedir)
-          gettext.textdomain("update-manager")
+          locale.bindtextdomain("ubuntu-release-upgrader",localedir)
+          gettext.textdomain("ubuntu-release-upgrader")
         except Exception as e:
           logging.warning("Error setting locales (%s)" % e)
         
@@ -400,7 +400,7 @@
           pass
         SimpleGtkbuilderApp.__init__(self, 
                                      gladedir+"/DistUpgrade.ui", 
-                                     "update-manager")
+                                     "ubuntu-release-upgrader")
         # terminal stuff
         self.create_terminal()
 

=== modified file 'DistUpgrade/DistUpgradeViewGtk3.py'
--- DistUpgrade/DistUpgradeViewGtk3.py	2012-06-13 11:40:17 +0000
+++ DistUpgrade/DistUpgradeViewGtk3.py	2012-06-27 19:25:24 +0000
@@ -407,14 +407,14 @@
         Gtk.init_check(sys.argv)
 
         try:
-            locale.bindtextdomain("update-manager",localedir)
-            gettext.textdomain("update-manager")
+            locale.bindtextdomain("ubuntu-release-upgrader",localedir)
+            gettext.textdomain("ubuntu-release-upgrader")
         except Exception as e:
             logging.warning("Error setting locales (%s)" % e)
 
         SimpleGtkbuilderApp.__init__(self,
                                      gladedir+"/DistUpgrade.ui",
-                                     "update-manager")
+                                     "ubuntu-release-upgrader")
 
         icons = Gtk.IconTheme.get_default()
         try:

=== modified file 'DistUpgrade/DistUpgradeViewKDE.py'
--- DistUpgrade/DistUpgradeViewKDE.py	2012-06-13 11:41:10 +0000
+++ DistUpgrade/DistUpgradeViewKDE.py	2012-06-27 19:25:24 +0000
@@ -455,12 +455,12 @@
         if not datadir:
           localedir=os.path.join(os.getcwd(),"mo")
         else:
-          localedir="/usr/share/locale/update-manager"
+          localedir="/usr/share/locale/ubuntu-release-upgrader"
 
         # FIXME: i18n must be somewhere relative do this dir
         try:
-          gettext.bindtextdomain("update-manager", localedir)
-          gettext.textdomain("update-manager")
+          gettext.bindtextdomain("ubuntu-release-upgrader", localedir)
+          gettext.textdomain("ubuntu-release-upgrader")
         except Exception as e:
           logging.warning("Error setting locales (%s)" % e)
 
@@ -474,7 +474,7 @@
         # exception when run without DISPLAY but dies instead
         if not "DISPLAY" in os.environ:
             raise Exception("No DISPLAY in os.environ found")
-        self.app = QApplication(["update-manager"])
+        self.app = QApplication(["ubuntu-release-upgrader"])
 
         if os.path.exists("/usr/share/icons/oxygen/48x48/apps/system-software-update.png"):
             messageIcon = QPixmap("/usr/share/icons/oxygen/48x48/apps/system-software-update.png")
@@ -524,8 +524,8 @@
         subprocess.call(["killall", "adept_updater"])
 
         # init gettext
-        gettext.bindtextdomain("update-manager",localedir)
-        gettext.textdomain("update-manager")
+        gettext.bindtextdomain("ubuntu-release-upgrader",localedir)
+        gettext.textdomain("ubuntu-release-upgrader")
         self.translate_widget_children()
         self.window_main.label_title.setText(self.window_main.label_title.text().replace("Ubuntu", "Kubuntu"))
 
@@ -610,7 +610,7 @@
         """start konqueror"""
         #need to run this else kdesu can't run Konqueror
         #subprocess.call(['su', 'ubuntu', 'xhost', '+localhost'])
-        QDesktopServices.openUrl(QUrl("https://launchpad.net/ubuntu/+source/update-manager/+filebug"))
+        QDesktopServices.openUrl(QUrl("https://launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+filebug"))
 
     def showTerminal(self):
         if self.window_main.konsole_frame.isVisible():

=== modified file 'DistUpgrade/DistUpgradeViewText.py'
--- DistUpgrade/DistUpgradeViewText.py	2012-06-13 11:19:42 +0000
+++ DistUpgrade/DistUpgradeViewText.py	2012-06-27 19:25:24 +0000
@@ -33,7 +33,7 @@
 
 import gettext
 from .DistUpgradeGettext import gettext as _
-from .utils import twrap
+from UpdateManager.Core.utils import twrap
 
 class TextAcquireProgress(AcquireProgress, apt.progress.text.AcquireProgress):
     def __init__(self):
@@ -68,11 +68,11 @@
         if not datadir:
           localedir=os.path.join(os.getcwd(),"mo")
         else:
-          localedir="/usr/share/locale/update-manager"
+          localedir="/usr/share/locale/ubuntu-release-upgrader"
 
         try:
-          gettext.bindtextdomain("update-manager", localedir)
-          gettext.textdomain("update-manager")
+          gettext.bindtextdomain("ubuntu-release-upgrader", localedir)
+          gettext.textdomain("ubuntu-release-upgrader")
         except Exception as e:
           logging.warning("Error setting locales (%s)" % e)
         

=== removed symlink 'DistUpgrade/MetaRelease.py'
=== target was u'../UpdateManager/Core/MetaRelease.py'
=== added file 'DistUpgrade/SimpleGtk3builderApp.py'
--- DistUpgrade/SimpleGtk3builderApp.py	1970-01-01 00:00:00 +0000
+++ DistUpgrade/SimpleGtk3builderApp.py	2012-06-27 19:25:24 +0000
@@ -0,0 +1,61 @@
+"""
+ SimpleGladeApp.py
+ Module that provides an object oriented abstraction to pygtk and libglade.
+ Copyright (C) 2004 Sandino Flores Moreno
+"""
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+import logging
+
+from gi.repository import Gtk
+
+# based on SimpleGladeApp
+class SimpleGtkbuilderApp:
+
+    def __init__(self, path, domain):
+        self.builder = Gtk.Builder()
+        self.builder.set_translation_domain(domain)
+        self.builder.add_from_file(path)
+        self.builder.connect_signals(self)
+        for o in self.builder.get_objects():
+            if issubclass(type(o), Gtk.Buildable):
+                name = Gtk.Buildable.get_name(o)
+                setattr(self, name, o)
+            else:
+                logging.debug("WARNING: can not get name for '%s'" % o)
+
+    def run(self):
+        """
+        Starts the main loop of processing events checking for Control-C.
+
+        The default implementation checks wheter a Control-C is pressed,
+        then calls on_keyboard_interrupt().
+
+        Use this method for starting programs.
+        """
+        try:
+            Gtk.main()
+        except KeyboardInterrupt:
+            self.on_keyboard_interrupt()
+
+    def on_keyboard_interrupt(self):
+        """
+        This method is called by the default implementation of run()
+        after a program is finished by pressing Control-C.
+        """
+        pass
+

=== removed symlink 'DistUpgrade/SimpleGtk3builderApp.py'
=== target was u'../UpdateManager/SimpleGtk3builderApp.py'
=== added file 'DistUpgrade/SimpleGtkbuilderApp.py'
--- DistUpgrade/SimpleGtkbuilderApp.py	1970-01-01 00:00:00 +0000
+++ DistUpgrade/SimpleGtkbuilderApp.py	2012-06-27 19:25:24 +0000
@@ -0,0 +1,61 @@
+"""
+ SimpleGladeApp.py
+ Module that provides an object oriented abstraction to pygtk and libglade.
+ Copyright (C) 2004 Sandino Flores Moreno
+"""
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+import logging
+
+import gtk
+
+# based on SimpleGladeApp
+class SimpleGtkbuilderApp:
+
+    def __init__(self, path, domain):
+        self.builder = gtk.Builder()
+        self.builder.set_translation_domain(domain)
+        self.builder.add_from_file(path)
+        self.builder.connect_signals(self)
+        for o in self.builder.get_objects():
+            if issubclass(type(o), gtk.Buildable):
+                name = gtk.Buildable.get_name(o)
+                setattr(self, name, o)
+            else:
+                logging.debug("WARNING: can not get name for '%s'" % o)
+
+    def run(self):
+        """
+        Starts the main loop of processing events checking for Control-C.
+
+        The default implementation checks wheter a Control-C is pressed,
+        then calls on_keyboard_interrupt().
+
+        Use this method for starting programs.
+        """
+        try:
+            gtk.main()
+        except KeyboardInterrupt:
+            self.on_keyboard_interrupt()
+
+    def on_keyboard_interrupt(self):
+        """
+        This method is called by the default implementation of run()
+        after a program is finished by pressing Control-C.
+        """
+        pass
+

=== removed symlink 'DistUpgrade/SimpleGtkbuilderApp.py'
=== target was u'../UpdateManager/SimpleGtkbuilderApp.py'
=== modified file 'DistUpgrade/TODO'
--- DistUpgrade/TODO	2006-10-05 14:36:09 +0000
+++ DistUpgrade/TODO	2012-06-27 19:25:24 +0000
@@ -8,8 +8,8 @@
  * if run from CDROM and we have network -> do a self update
  * support dapper-commercial in sources.list rewriting
  * after "no-network" dist-upgrade it is most likely that the system
-   is only half-upgraded and update-manager will not be able to do
-   the full upgrade. update-manager needs to be changed to support
+   is only half-upgraded and ubuntu-release-upgrader will not be able to do
+   the full upgrade. ubuntu-release-upgrader needs to be changed to support
    full dist-upgrades (possible by just calling the dist-upgrader
    in a special mode)
 

=== modified file 'DistUpgrade/build-tarball.sh'
--- DistUpgrade/build-tarball.sh	2012-06-11 15:08:35 +0000
+++ DistUpgrade/build-tarball.sh	2012-06-27 19:25:24 +0000
@@ -7,7 +7,7 @@
 # cleanup
 echo "Cleaning up"
 
-for d in ./ janitor/; do
+for d in ./; do
     rm -f $d/*~ $d/*.bak $d/*.pyc $d/*.moved $d/'#'* $d/*.rej $d/*.orig
     rm -rf $d/__pycache__
     rm -f *.tar.gz *.tar
@@ -38,4 +38,4 @@
 tar --append -v -f $DIST.tar ./DistUpgrade
 
 # and compress it
-gzip -9 $DIST.tar
\ No newline at end of file
+gzip -9 $DIST.tar

=== modified file 'DistUpgrade/crashdialog.ui'
--- DistUpgrade/crashdialog.ui	2008-07-28 17:48:53 +0000
+++ DistUpgrade/crashdialog.ui	2012-06-27 19:25:24 +0000
@@ -59,7 +59,7 @@
      <item>
       <widget class="QLabel" name="crash_info_text" >
        <property name="text" >
-        <string>&lt;qt>We're sorry; the upgrade tool crashed. Please file a new bug report at &lt;a href="http://launchpad.net/ubuntu/+source/update-manager">http://launchpad.net/ubuntu/+source/update-manager&lt;/a> (do not attach your details to any existing bug) and a developer will attend to the problem as soon as possible. To help the developers understand what went wrong, include the following detail in your bug report, and attach the files /var/log/dist-upgrade/apt.log and /var/log/dist-upgrade/main.log:</string>
+        <string>&lt;qt>We're sorry; the upgrade tool crashed. Please file a new bug report at &lt;a href="http://launchpad.net/ubuntu/+source/ubuntu-release-upgrader">http://launchpad.net/ubuntu/+source/ubuntu-release-upgrader&lt;/a> (do not attach your details to any existing bug) and a developer will attend to the problem as soon as possible. To help the developers understand what went wrong, include the following detail in your bug report, and attach the files /var/log/dist-upgrade/apt.log and /var/log/dist-upgrade/main.log:</string>
        </property>
        <property name="alignment" >
         <set>Qt::AlignVCenter</set>

=== removed symlink 'DistUpgrade/janitor'
=== target was u'../janitor'
=== modified file 'DistUpgrade/removal_blacklist.cfg'
--- DistUpgrade/removal_blacklist.cfg	2012-04-17 19:26:33 +0000
+++ DistUpgrade/removal_blacklist.cfg	2012-06-27 19:25:24 +0000
@@ -5,9 +5,10 @@
 kubuntu-desktop
 xubuntu-desktop
 lubuntu-desktop
-# update-manager itself should not remove itself
+# ubuntu-release-upgrader should not remove itself or update-manager
 update-manager
 update-manager-core
+ubuntu-release-upgrader
 # posgresql (LP: #871893)
 ^postgresql-.*[0-9]\.[0-9].*
 # the upgrade runs in it

=== removed symlink 'DistUpgrade/utils.py'
=== target was u'../UpdateManager/Core/utils.py'
=== modified file 'DistUpgrade/xorg_fix_proprietary.py'
--- DistUpgrade/xorg_fix_proprietary.py	2012-05-28 10:20:51 +0000
+++ DistUpgrade/xorg_fix_proprietary.py	2012-06-27 19:25:24 +0000
@@ -31,7 +31,7 @@
             if (line.lower().startswith("section") and 
                 line.lower().split("#")[0].strip().endswith('"inputdevice"')):
                 logging.debug("found 'InputDevice' section")
-                content.append("# commented out by update-manager, HAL is now used and auto-detects devices\n")
+                content.append("# commented out by ubuntu-release-upgrader, HAL is now used and auto-detects devices\n")
                 content.append("# Keyboard settings are now read from /etc/default/console-setup\n")
                 content.append("#"+raw)
                 in_input_devices=True
@@ -40,7 +40,7 @@
                 in_input_devices=False
             elif line.lower().startswith("inputdevice"):
                 logging.debug("commenting out '%s' " % line)
-                content.append("# commented out by update-manager, HAL is now used and auto-detects devices\n")
+                content.append("# commented out by ubuntu-release-upgrader, HAL is now used and auto-detects devices\n")
                 content.append("# Keyboard settings are now read from /etc/default/console-setup\n")
                 content.append("#"+raw)
             elif in_input_devices:
@@ -123,8 +123,8 @@
         print("Need to run as root")
         sys.exit(1)
 
-    # we pretend to be update-manger so that apport picks up when we crash
-    sys.argv[0] = "/usr/bin/update-manager"
+    # we pretend to be do-release-upgrade so that apport picks up when we crash
+    sys.argv[0] = "/usr/bin/do-release-upgrade"
 
     # setup logging
     logging.basicConfig(level=logging.DEBUG,

=== removed file 'LGPL'
--- LGPL	2007-02-07 15:47:06 +0000
+++ LGPL	1970-01-01 00:00:00 +0000
@@ -1,510 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-

-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-

-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-

-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-

-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-

-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-

-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-

-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-

-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-

-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

=== removed file 'README'
--- README	2012-05-15 19:43:43 +0000
+++ README	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-Software Updater for apt
-------------------------
-
-This is an application which lets you manage available updates for your
-computer via apt and python-apt.
-
-It also supports easy release upgrades.  The following environment variables
-are honored:
-
-DEBUG_UPDATE_MANAGER:
-- If set, debug information is printed to sys.stderr.  This is useful for
-  testing e.g. release upgrade checking/fetching.
-
-
-If the release upgrade is running in text mode and gnu screen is
-available it will automatically use gnu screen. This means that if
-e.g. the network connection is dropping just running the upgrader
-again will just reconnect to the running upgrade.

=== renamed file 'README.dist-upgrade' => 'README'
=== removed file 'TODO'
--- TODO	2007-07-31 10:55:22 +0000
+++ TODO	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-* offer removal of no-longer-supported apps
-* improve countrymirror detection
-
-
-UpdateManager.Common.aptsources.py:
-- make the distro detection in sources.list more clever by using the
-  origin informaton to avoid adding full uris to (unofficial/internal)
-  mirrors 
-- make it possible to inherit the mirrros from a ParentSuite (for
-  the childs)
-
-Misc:
-- have a common error dialog readymade and rib out all those 
-  GtkMessageDialogs
-- add download size to treeview
-- add /etc/apt/software-properties.d dir where the user can
-  install matchers and templates
-- handle cases like "deb http://bla/ dist sec1 sec2 # comment" 
-- rework the add channel/cdrom dialogs
-- d'n'd for key files
-- use one row per section and not one per channel in the treeview
-- sort the sources by dist

=== removed directory 'UpdateManager'
=== removed file 'UpdateManager/ChangelogViewer.py'
--- UpdateManager/ChangelogViewer.py	2012-06-11 16:17:31 +0000
+++ UpdateManager/ChangelogViewer.py	1970-01-01 00:00:00 +0000
@@ -1,283 +0,0 @@
-# ReleaseNotesViewer.py
-#  
-#  Copyright (c) 2006 Sebastian Heinlein
-#                2007 Canonical
-#  
-#  Author: Sebastian Heinlein <[e-mail]>
-#          Michael Vogt <[e-mail]>
-#
-#  This modul provides an inheritance of the Gtk.TextView that is 
-#  aware of http URLs and allows to open them in a browser.
-#  It is based on the pygtk-demo "hypertext".
-# 
-#  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
-
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import GObject
-from gi.repository import Pango
-from gettext import gettext as _
-
-from .ReleaseNotesViewer import open_url
-
-class ChangelogViewer(Gtk.TextView):
-    def __init__(self, changelog=None):
-        """Init the ChangelogViewer as an Inheritance of the Gtk.TextView"""
-        # init the parent
-        GObject.GObject.__init__(self)
-        # global hovering over link state
-        self.hovering = False
-        self.first = True
-        # setup the buffer and signals
-        self.set_property("editable", False)
-        self.set_cursor_visible(False)
-        # set some margin
-        self.set_right_margin(4)
-        self.set_left_margin(4)
-        self.set_pixels_above_lines(4)
-        self.buffer = Gtk.TextBuffer()
-        self.set_buffer(self.buffer)
-        self.connect("button-press-event", self.button_press_event)
-        self.connect("motion-notify-event", self.motion_notify_event)
-        self.connect("visibility-notify-event", self.visibility_notify_event)
-        #self.buffer.connect("changed", self.search_links)
-        self.buffer.connect_after("insert-text", self.on_insert_text)
-        # search for links in the changelog and make them clickable
-        if changelog != None:
-            self.buffer.set_text(changelog)
-            
-    def create_context_menu(self, url):
-        """Create the context menu to be displayed when links are right clicked"""
-        self.menu = Gtk.Menu()
-        
-        # create menu items
-        item_grey_link = Gtk.MenuItem()
-        item_grey_link.set_label(url)
-        item_grey_link.connect("activate", self.handle_context_menu, "open", url)
-        item_seperator = Gtk.MenuItem()
-        item_open_link = Gtk.MenuItem()
-        item_open_link.set_label(_("Open Link in Browser"))
-        item_open_link.connect("activate", self.handle_context_menu, "open", url)
-        item_copy_link = Gtk.MenuItem()
-        item_copy_link.set_label(_("Copy Link to Clipboard"))
-        item_copy_link.connect("activate", self.handle_context_menu, "copy", url)
-        
-        # add menu items
-        self.menu.add(item_grey_link)
-        self.menu.add(item_seperator)
-        self.menu.add(item_open_link)
-        self.menu.add(item_copy_link)
-        self.menu.show_all()
-    
-    def handle_context_menu(self, menuitem, action, url):
-        """Handle activate event for the links' context menu"""
-        if action == "open":
-            open_url(url)
-        if action == "copy":
-            # the following two lines used to be enough - then gtk3/pygi
-            # came along ...
-            #cb = Gtk.Clipboard()
-            #cb.set_text(url)
-            display = Gdk.Display.get_default()
-            selection = Gdk.Atom.intern ("CLIPBOARD", False)
-            cb = Gtk.Clipboard.get_for_display(display, selection)
-            cb.set_text(url, -1)
-            cb.store()
-
-    def tag_link(self, start, end, url):
-        """Apply the tag that marks links to the specified buffer selection"""
-        tags = start.get_tags()
-        for tag in tags:
-            url = getattr(tag, "url", None)
-            if url != "":
-                return
-        tag = self.buffer.create_tag(None, foreground="blue",
-                                     underline=Pango.Underline.SINGLE)
-        tag.url = url
-        self.buffer.apply_tag(tag , start, end)
-
-    def on_insert_text(self, buffer, iter_end, text, *args):
-        """Search for http URLs in newly inserted text  
-           and tag them accordingly"""
-
-        # some convenient urls
-        MALONE = "https://launchpad.net/bugs/"
-        DEBIAN = "http://bugs.debian.org/"
-        CVE = "http://cve.mitre.org/cgi-bin/cvename.cgi?name="
-        # some convinient end-markers
-        ws = [" ","\t","\n"]
-        brak = [")","]",">"]
-        punct = [",","!",":"]
-        dot = ["."]+punct
-        dot_cr = [".\n"]
-
-        # search items are start-str, list-of-end-strs, url-prefix
-        # a lot of this search is "TEH SUCK"(tm) because of limitations
-        # in iter.forward_search()
-        # - i.e. no insensitive searching, no regexp
-        search_items = [ ("http://", ws+brak+punct+dot_cr, "http://"),
-                         ("LP#", ws+brak+dot, MALONE),
-                         ("LP: #", ws+brak+dot, MALONE),
-                         ("lp: #", ws+brak+dot, MALONE),
-                         ("LP:#",  ws+brak+dot, MALONE),
-                         ("Malone: #", ws+brak+dot, MALONE),
-                         ("Malone:#", ws+brak+dot, MALONE),
-                         ("Ubuntu: #", ws+brak+dot, MALONE),
-                         ("Ubuntu:#", ws+brak+dot, MALONE),
-                         ("Closes: #",ws+brak+dot, DEBIAN),
-                         ("Closes:#",ws+brak+dot, DEBIAN),
-                         ("closes:#",ws+brak+dot, DEBIAN),
-                         ("closes: #",ws+brak+dot, DEBIAN),
-                         ("CVE-", ws+brak+dot, CVE),
-                       ]
-        # init
-        iter = buffer.get_iter_at_offset(iter_end.get_offset() - len(text))
-
-        # search for the next match in the buffer
-        for (start_str, end_list, url_prefix) in search_items:
-            while True:
-                ret = iter.forward_search(start_str,
-                                          Gtk.TextSearchFlags.VISIBLE_ONLY,
-                                          iter_end)
-                # if we reach the end break the loop
-                if not ret:
-                    break
-                # get the position of the protocol prefix
-                (match_start, match_end) = ret
-                match_suffix = match_end.copy()
-                match_tmp = match_end.copy()
-                while True:
-                    # extend the selection to the complete search item
-                    if match_tmp.forward_char():
-                        text =  match_end.get_text(match_tmp)
-                        if text in end_list:
-                            break
-                        # move one char futher to get two char
-                        # end-markers (and back later) LP: #396393
-                        match_tmp.forward_char()
-                        text =  match_end.get_text(match_tmp)
-                        if text in end_list:
-                            break
-                        match_tmp.backward_char()
-                    else:
-                        break
-                    match_end = match_tmp.copy()
-
-                # call the tagging method for the complete URL
-                url = url_prefix + match_suffix.get_text(match_end)
-
-                self.tag_link(match_start, match_end, url)
-                # set the starting point for the next search
-                iter = match_end
-
-    def button_press_event(self, text_view, event):
-        """callback for mouse click events"""
-        # we only react on left or right mouse clicks
-        if event.button != 1 and event.button != 3:
-            return False
-
-        # try to get a selection
-        try:
-            (start, end) = self.buffer.get_selection_bounds()
-        except ValueError:
-            pass
-        else:
-            if start.get_offset() != end.get_offset():
-                return False
-
-        # get the iter at the mouse position
-        (x, y) = self.window_to_buffer_coords(Gtk.TextWindowType.WIDGET,
-                                              int(event.x), int(event.y))
-        iter = self.get_iter_at_location(x, y)
-        
-        # call open_url or menu.popup if an URL is assigned to the iter
-        tags = iter.get_tags()
-        for tag in tags:
-            if hasattr(tag, "url"):
-                if event.button == 1: 
-                    open_url(tag.url)
-                    break
-                if event.button == 3:
-                    self.create_context_menu(tag.url)
-                    self.menu.popup(None, None, None, None, event.button, event.time)
-                    return True
-
-    def motion_notify_event(self, text_view, event):
-        """callback for the mouse movement event, that calls the
-           check_hovering method with the mouse postition coordiantes"""
-        x, y = text_view.window_to_buffer_coords(Gtk.TextWindowType.WIDGET,
-                                                 int(event.x), int(event.y))
-        self.check_hovering(x, y)
-        self.get_window(Gtk.TextWindowType.TEXT).get_pointer()
-        return False
-    
-    def visibility_notify_event(self, text_view, event):
-        """callback if the widgets gets visible (e.g. moves to the foreground)
-           that calls the check_hovering method with the mouse position
-           coordinates"""
-        (screen, wx, wy, mod) = text_view.get_window(Gtk.TextWindowType.TEXT).get_pointer()
-        (bx, by) = text_view.window_to_buffer_coords(Gtk.TextWindowType.WIDGET, wx,
-                                                     wy)
-        self.check_hovering(bx, by)
-        return False
-
-    def check_hovering(self, x, y):
-        """Check if the mouse is above a tagged link and if yes show
-           a hand cursor"""
-        _hovering = False
-        # get the iter at the mouse position
-        iter = self.get_iter_at_location(x, y)
-        
-        # set _hovering if the iter has the tag "url"
-        tags = iter.get_tags()
-        for tag in tags:
-            if hasattr(tag, "url"):
-                _hovering = True
-                break
-
-        # change the global hovering state
-        if _hovering != self.hovering or self.first == True:
-            self.first = False
-            self.hovering = _hovering
-            # Set the appropriate cursur icon
-            if self.hovering:
-                self.get_window(Gtk.TextWindowType.TEXT).\
-                        set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND2))
-            else:
-                self.get_window(Gtk.TextWindowType.TEXT).\
-                        set_cursor(Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR))
-
-
-if __name__ == "__main__":
-    w = Gtk.Window()
-    cv = ChangelogViewer()
-    changes = cv.get_buffer()
-    changes.create_tag("versiontag", weight=Pango.Weight.BOLD)
-    changes.set_text("""
-
-Version 6-14-0ubuntu1.9.04:
-
-  * New upstream version. LP: #382918.
-    Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
-
-""")
-
-    w.add(cv)
-    w.show_all()
-    Gtk.main()

=== removed directory 'UpdateManager/Core'
=== removed file 'UpdateManager/Core/AlertWatcher.py'
--- UpdateManager/Core/AlertWatcher.py	2012-05-01 14:01:29 +0000
+++ UpdateManager/Core/AlertWatcher.py	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-# AlertWatcher.py 
-#
-#  Copyright (c) 2010 Mohamed Amine IL Idrissi
-#  
-#  Author: Mohamed Amine IL Idrissi <[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
-
-from gi.repository import GObject
-import dbus
-from dbus.mainloop.glib import DBusGMainLoop
-
-class AlertWatcher(GObject.GObject):
-    """ a class that checks for alerts and reports them, like a battery
-    or network warning """
-    
-    __gsignals__ = {"network-alert": (GObject.SignalFlags.RUN_FIRST,
-                                      None,
-                                      (GObject.TYPE_INT,)),
-                    "battery-alert": (GObject.SignalFlags.RUN_FIRST,
-                                      None,
-                                      (GObject.TYPE_BOOLEAN,)),
-                    "network-3g-alert": (GObject.SignalFlags.RUN_FIRST,
-                                         None,
-                                        (GObject.TYPE_BOOLEAN,
-                                         GObject.TYPE_BOOLEAN,)),
-                    }
-    
-    def __init__(self):
-        GObject.GObject.__init__(self)
-        DBusGMainLoop(set_as_default=True)
-        self.bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
-        self.network_state = 3 # make it always connected if NM isn't available
-        
-    def check_alert_state(self):
-        try:
-            obj = self.bus.get_object("org.freedesktop.NetworkManager",
-                                      "/org/freedesktop/NetworkManager")
-            obj.connect_to_signal("StateChanged",
-                                  self._on_network_state_changed,
-                                  dbus_interface="org.freedesktop.NetworkManager")
-            interface = dbus.Interface(obj, "org.freedesktop.DBus.Properties")
-            self.network_state = interface.Get("org.freedesktop.NetworkManager", "State")
-            self._network_alert(self.network_state)
-            # power
-            obj = self.bus.get_object('org.freedesktop.UPower',
-                                      '/org/freedesktop/UPower')
-            obj.connect_to_signal("Changed", self._power_changed,
-                                  dbus_interface="org.freedesktop.UPower")
-            self._power_changed()
-            # 3g
-            self._update_3g_state()
-        except dbus.exceptions.DBusException:
-            pass
-
-    def _on_network_state_changed(self, state):
-        self._network_alert(state)
-        self._update_3g_state()
-
-    def _update_3g_state(self):
-        from .roam import NetworkManagerHelper
-        nm = NetworkManagerHelper()
-        on_3g = nm.is_active_connection_gsm_or_cdma()
-        is_roaming = nm.is_active_connection_gsm_or_cdma_roaming()
-        self._network_3g_alert(on_3g, is_roaming)
-
-    def _network_3g_alert(self, on_3g, is_roaming):
-        self.emit("network-3g-alert", on_3g, is_roaming)
-    
-    def _network_alert(self, state):
-        self.network_state = state
-        self.emit("network-alert", state)
-        
-    def _power_changed(self):
-        obj = self.bus.get_object("org.freedesktop.UPower", \
-                                "/org/freedesktop/UPower")
-        interface = dbus.Interface(obj, "org.freedesktop.DBus.Properties")
-        on_battery = interface.Get("org.freedesktop.UPower", "OnBattery")
-        self.emit("battery-alert", on_battery)
-        
-    

=== removed file 'UpdateManager/Core/DistUpgradeFetcherCore.py'
--- UpdateManager/Core/DistUpgradeFetcherCore.py	2012-05-28 10:20:51 +0000
+++ UpdateManager/Core/DistUpgradeFetcherCore.py	1970-01-01 00:00:00 +0000
@@ -1,313 +0,0 @@
-# DistUpgradeFetcherCore.py 
-#  
-#  Copyright (c) 2006 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 string import Template
-import os
-import apt_pkg
-import logging
-import tarfile
-import tempfile
-import shutil
-import sys
-import subprocess
-from gettext import gettext as _
-from aptsources.sourceslist import SourcesList
-
-from .utils import get_dist, url_downloadable, country_mirror
-
-class DistUpgradeFetcherCore(object):
-    " base class (without GUI) for the upgrade fetcher "
-
-    DEFAULT_MIRROR="http://archive.ubuntu.com/ubuntu"
-    DEFAULT_COMPONENT="main"
-    DEBUG = "DEBUG_UPDATE_MANAGER" in os.environ
-
-    def __init__(self, new_dist, progress):
-        self.new_dist = new_dist
-        self.current_dist_name = get_dist()
-        self._progress = progress
-        # options to pass to the release upgrader when it is run
-        self.run_options = []
-
-    def _debug(self, msg):
-        " helper to show debug information "
-        if self.DEBUG:
-            sys.stderr.write(msg+"\n")
-
-    def showReleaseNotes(self):
-        return True
-
-    def error(self, summary, message):
-        """ dummy implementation for error display, should be overwriten
-            by subclasses that want to more fancy method
-        """
-        print(summary)
-        print(message)
-        return False
-
-    def authenticate(self):
-        if self.new_dist.upgradeToolSig:
-            f = self.tmpdir+"/"+os.path.basename(self.new_dist.upgradeTool)
-            sig = self.tmpdir+"/"+os.path.basename(self.new_dist.upgradeToolSig)
-            print(_("authenticate '%(file)s' against '%(signature)s' ") % {
-                'file' : os.path.basename(f),
-                'signature' : os.path.basename(sig)})
-            if self.gpgauthenticate(f, sig):
-                return True
-        return False
-
-    def gpgauthenticate(self, file, signature,
-                        keyring='/etc/apt/trusted.gpg'):
-        """ authenticated a file against a given signature, if no keyring
-            is given use the apt default keyring
-        """
-        status_pipe = os.pipe()
-        logger_pipe = os.pipe()
-        gpg = [
-            "gpg",
-            "--status-fd", "%d" % status_pipe[1],
-            "--logger-fd", "%d" % logger_pipe[1],
-            "--no-options",
-            "--homedir", self.tmpdir,
-            "--no-default-keyring",
-            "--ignore-time-conflict",
-            "--keyring", keyring,
-            "--verify", signature, file,
-            ]
-        def gpg_preexec():
-            os.close(status_pipe[0])
-            os.close(logger_pipe[0])
-        proc = subprocess.Popen(
-            gpg, stderr=subprocess.PIPE, preexec_fn=gpg_preexec,
-            close_fds=False, universal_newlines=True)
-        os.close(status_pipe[1])
-        os.close(logger_pipe[1])
-        status_handle = os.fdopen(status_pipe[0])
-        logger_handle = os.fdopen(logger_pipe[0])
-        try:
-            gpgres = status_handle.read()
-            ret = proc.wait()
-            if ret != 0:
-                # gnupg returned a problem (non-zero exit)
-                print("gpg exited %d" % ret)
-                print("Debug information: ")
-                print(status_handle.read())
-                print(proc.stderr.read())
-                print(logger_handle.read())
-                return False
-            if "VALIDSIG" in gpgres:
-                return True
-            print("invalid result from gpg:")
-            print(gpgres)
-            return False
-        finally:
-            status_handle.close()
-            proc.stderr.close()
-            logger_handle.close()
-
-    def extractDistUpgrader(self):
-          # extract the tarbal
-          fname = os.path.join(self.tmpdir,os.path.basename(self.uri))
-          print(_("extracting '%s'") % os.path.basename(fname))
-          if not os.path.exists(fname):
-              return False
-          try:
-              tar = tarfile.open(self.tmpdir+"/"+os.path.basename(self.uri),"r")
-              for tarinfo in tar:
-                  tar.extract(tarinfo)
-              tar.close()
-          except tarfile.ReadError as e:
-              logging.error("failed to open tarfile (%s)" % e)
-              return False
-          return True
-
-    def verifyDistUprader(self):
-        # FIXME: check a internal dependency file to make sure
-        #        that the script will run correctly
-          
-        # see if we have a script file that we can run
-        self.script = script = "%s/%s" % (self.tmpdir, self.new_dist.name)
-        if not os.path.exists(script):
-            return self.error(_("Could not run the upgrade tool"),
-                         _("Could not run the upgrade tool") + ".  " + _("This is most likely a bug in the upgrade tool. "
-                          "Please report it as a bug using the command 'ubuntu-bug update-manager'."))
-        return True
-
-    def mirror_from_sources_list(self, uri, default_uri):
-      """
-      try to figure what the mirror is from current sources.list
-
-      do this by looing for matching DEFAULT_COMPONENT, current dist
-      in sources.list and then doing a http HEAD/ftp size request
-      to see if the uri is available on this server
-      """
-      self._debug("mirror_from_sources_list: %s" % self.current_dist_name)
-      sources = SourcesList(withMatcher=False)
-      seen = set()
-      for e in sources.list:
-        if e.disabled or e.invalid or not e.type == "deb":
-          continue
-        # check if we probed this mirror already
-        if e.uri in seen:
-          continue
-        # we are using the main mirror already, so we are fine
-        if (e.uri.startswith(default_uri) and 
-            e.dist == self.current_dist_name and
-            self.DEFAULT_COMPONENT in e.comps):
-          return uri
-        elif (e.dist == self.current_dist_name and
-              "main" in e.comps):
-          mirror_uri = e.uri+uri[len(default_uri):]
-          if url_downloadable(mirror_uri, self._debug):
-            return mirror_uri
-          seen.add(e.uri)
-      self._debug("no mirror found")
-      return ""
-
-    def _expandUri(self, uri):
-        """
-        expand the uri so that it uses a mirror if the url starts
-        with a well know string (like archive.ubuntu.com)
-        """
-        # try to guess the mirror from the sources.list
-        if uri.startswith(self.DEFAULT_MIRROR):
-          self._debug("trying to find suitable mirror")
-          new_uri = self.mirror_from_sources_list(uri, self.DEFAULT_MIRROR)
-          if new_uri:
-            return new_uri
-        # if that fails, use old method
-        uri_template = Template(uri)
-        m = country_mirror()
-        new_uri = uri_template.safe_substitute(countrymirror=m)
-        # be paranoid and check if the given uri is really downloadable
-        try:
-            if not url_downloadable(new_uri, self._debug):
-              raise Exception("failed to download %s" % new_uri)
-        except Exception as e:
-            self._debug("url '%s' could not be downloaded" % e)
-            # else fallback to main server
-            new_uri = uri_template.safe_substitute(countrymirror='')
-        return new_uri
-
-    def fetchDistUpgrader(self):
-        " download the tarball with the upgrade script "
-        self.tmpdir = tmpdir = tempfile.mkdtemp(prefix="update-manager-")
-        os.chdir(tmpdir)
-        logging.debug("using tmpdir: '%s'" % tmpdir)
-        # turn debugging on here (if required)
-        if self.DEBUG > 0:
-            apt_pkg.config.set("Debug::Acquire::http","1")
-            apt_pkg.config.set("Debug::Acquire::ftp","1")
-        #os.listdir(tmpdir)
-        fetcher = apt_pkg.Acquire(self._progress)
-        if self.new_dist.upgradeToolSig != None:
-            uri = self._expandUri(self.new_dist.upgradeToolSig)
-            af1 = apt_pkg.AcquireFile(fetcher, 
-                                     uri, 
-                                     descr=_("Upgrade tool signature"))
-            # reference it here to shut pyflakes up
-            af1
-        if self.new_dist.upgradeTool != None:
-            self.uri = self._expandUri(self.new_dist.upgradeTool)
-            af2 = apt_pkg.AcquireFile(fetcher, 
-                                     self.uri, 
-                                     descr=_("Upgrade tool"))
-            # reference it here to shut pyflakes up
-            af2
-            result = fetcher.run()
-            if result != fetcher.RESULT_CONTINUE:
-                logging.warn("fetch result != continue (%s)" % result)
-                return False
-            # check that both files are really there and non-null
-            for f in [os.path.basename(self.new_dist.upgradeToolSig),
-                      os.path.basename(self.new_dist.upgradeTool)]:
-                if not (os.path.exists(f) and os.path.getsize(f) > 0):
-                    logging.warn("file '%s' missing" % f)
-                    return False
-            return True
-        return False
-
-    def runDistUpgrader(self):
-        args = [self.script]+self.run_options
-        if os.getuid() != 0:
-            os.execv("/usr/bin/sudo",["sudo"]+args)
-        else:
-            os.execv(self.script,args)
-
-    def cleanup(self):
-      # cleanup
-      os.chdir("..")
-      # del tmpdir
-      shutil.rmtree(self.tmpdir)
-
-    def run(self):
-        # see if we have release notes
-        if not self.showReleaseNotes():
-            return
-        if not self.fetchDistUpgrader():
-            self.error(_("Failed to fetch"),
-                  _("Fetching the upgrade failed. There may be a network "
-                    "problem. "))
-            return
-        if not self.authenticate():
-            self.error(_("Authentication failed"),
-                  _("Authenticating the upgrade failed. There may be a problem "
-                    "with the network or with the server. "))
-            self.cleanup()
-            return
-        if not self.extractDistUpgrader():
-            self.error(_("Failed to extract"),
-                  _("Extracting the upgrade failed. There may be a problem "
-                  "with the network or with the server. "))
-                  
-            return
-        if not self.verifyDistUprader():
-            self.error(_("Verification failed"),
-                  _("Verifying the upgrade failed.  There may be a problem "
-                    "with the network or with the server. "))
-            self.cleanup()
-            return
-        try:
-            # check if we can execute, if we run it via sudo we will
-            # not know otherwise, sudo/gksu will not raise a exception
-            if not os.access(self.script, os.X_OK):
-                ex = OSError("Can not execute '%s'" % self.script)
-                ex.errno = 13
-                raise ex
-            self.runDistUpgrader()
-        except OSError as e:
-          if e.errno == 13:
-            self.error(_("Can not run the upgrade"),
-                       _("This usually is caused by a system where /tmp "
-                         "is mounted noexec. Please remount without "
-                         "noexec and run the upgrade again."))
-            return False
-          else:
-            self.error(_("Can not run the upgrade"),
-                       _("The error message is '%s'.") % e.strerror)
-        return True
-
-if __name__ == "__main__":
-    d = DistUpgradeFetcherCore(None,None)
-#    print(d.authenticate('/tmp/Release','/tmp/Release.gpg'))
-    print("got mirror: '%s'" % d.mirror_from_sources_list("http://archive.ubuntu.com/ubuntu/dists/intrepid-proposed/main/dist-upgrader-all/0.93.34/intrepid.tar.gz", "http://archive.ubuntu.com/ubuntu"))

=== removed file 'UpdateManager/Core/MetaRelease.py'
--- UpdateManager/Core/MetaRelease.py	2012-06-15 20:13:15 +0000
+++ UpdateManager/Core/MetaRelease.py	1970-01-01 00:00:00 +0000
@@ -1,350 +0,0 @@
-# MetaRelease.py 
-#  
-#  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
-
-import apt_pkg
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
-try:
-    from http.client import BadStatusLine
-except ImportError:
-    from httplib import BadStatusLine
-import logging
-import email.utils
-import os
-import sys
-import time
-import threading
-try:
-    from urllib.request import Request, urlopen
-    from urllib.error import HTTPError, URLError
-except ImportError:
-    from urllib2 import HTTPError, Request, URLError, urlopen
-
-from .utils import get_lang, get_dist, get_dist_version, get_ubuntu_flavor, get_ubuntu_flavor_name
-
-class Dist(object):
-    def __init__(self, name, version, date, supported):
-        self.name = name
-        self.version = version
-        self.date = date
-        self.supported = supported
-        self.releaseNotesURI = None
-        self.releaseNotesHtmlUri = None
-        self.upgradeTool = None
-        self.upgradeToolSig = None
-        # the server may report that the upgrade is broken currently
-        self.upgrade_broken = None
-
-class MetaReleaseCore(object):
-    """
-    A MetaReleaseCore object astracts the list of released 
-    distributions. 
-    """
-
-    DEBUG = "DEBUG_UPDATE_MANAGER" in os.environ
-
-    # some constants
-    CONF = "/etc/update-manager/release-upgrades"
-    CONF_METARELEASE = "/etc/update-manager/meta-release"
-
-    def __init__(self, 
-                 useDevelopmentRelease=False, 
-                 useProposed=False,
-                 forceLTS=False,
-                 forceDownload=False):
-        self._debug("MetaRelease.__init__() useDevel=%s useProposed=%s" % (useDevelopmentRelease, useProposed))
-        # force download instead of sending if-modified-since
-        self.forceDownload = forceDownload
-        # information about the available dists
-        self.downloading = True
-        self.upgradable_to = None
-        self.new_dist = None
-        self.flavor_name = get_ubuntu_flavor_name()
-        self.current_dist_name = get_dist()
-        self.current_dist_version = get_dist_version()
-        self.no_longer_supported = None
-
-        # default (if the conf file is missing)
-        self.METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release"
-        self.METARELEASE_URI_LTS = "http://changelogs.ubuntu.com/meta-release-lts"
-        self.METARELEASE_URI_UNSTABLE_POSTFIX = "-development"
-        self.METARELEASE_URI_PROPOSED_POSTFIX = "-development"
-
-        # check the meta-release config first
-        parser = configparser.ConfigParser()
-        if os.path.exists(self.CONF_METARELEASE):
-            try:
-                parser.read(self.CONF_METARELEASE)
-            except configparser.Error as e:
-                sys.stderr.write("ERROR: failed to read '%s':\n%s" % (
-                        self.CONF_METARELEASE, e))
-                return
-            # make changing the metarelease file and the location
-            # for the files easy
-            if parser.has_section("METARELEASE"):
-                sec = "METARELEASE"
-                for k in ["URI",
-                          "URI_LTS",
-                          "URI_UNSTABLE_POSTFIX",
-                          "URI_PROPOSED_POSTFIX"]:
-                    if parser.has_option(sec, k):
-                        self._debug("%s: %s " % (self.CONF_METARELEASE,
-                                                 parser.get(sec,k)))
-                        setattr(self, "%s_%s" % (sec, k), parser.get(sec, k))
-
-        # check the config file first to figure if we want lts upgrades only
-        parser = configparser.ConfigParser()
-        if os.path.exists(self.CONF):
-            try:
-                parser.read(self.CONF)
-            except configparser.Error as e:
-                sys.stderr.write("ERROR: failed to read '%s':\n%s" % (
-                        self.CONF, e))
-                return
-            # now check which specific url to use
-            if parser.has_option("DEFAULT","Prompt"):
-                type = parser.get("DEFAULT","Prompt").lower()
-                if (type == "never" or type == "no"):
-                    # nothing to do for this object
-                    # FIXME: what about no longer supported?
-                    self.downloading = False
-                    return
-                elif type == "lts":
-                    self.METARELEASE_URI = self.METARELEASE_URI_LTS
-        # needed for the _tryUpgradeSelf() code in DistUpgradeController
-        if forceLTS:
-            self.METARELEASE_URI = self.METARELEASE_URI_LTS
-        # devel and proposed "just" change the postfix
-        if useDevelopmentRelease:
-            self.METARELEASE_URI += self.METARELEASE_URI_UNSTABLE_POSTFIX
-        elif useProposed:
-            self.METARELEASE_URI += self.METARELEASE_URI_PROPOSED_POSTFIX
-
-        self._debug("metarelease-uri: %s" % self.METARELEASE_URI)
-        self.metarelease_information = None
-        if not self._buildMetaReleaseFile():
-            self._debug("_buildMetaReleaseFile failed")
-            return
-        # we start the download thread here and we have a timeout
-        threading.Thread(target=self.download).start()
-        #threading.Thread(target=self.check).start()
-
-    def _buildMetaReleaseFile(self):
-        # build the metarelease_file name
-        self.METARELEASE_FILE = os.path.join("/var/lib/update-manager/",
-                                            os.path.basename(self.METARELEASE_URI))
-        # check if we can write to the global location, if not,
-        # write to homedir
-        try:
-            open(self.METARELEASE_FILE,"a")
-        except IOError as e:
-            cache_dir = os.getenv(
-                "XDG_CACHE_HOME", os.path.expanduser("~/.cache"))
-            path = os.path.join(cache_dir, 'update-manager-core')
-            if not os.path.exists(path):
-                try:
-                    os.mkdir(path)
-                except OSError as e:
-                    sys.stderr.write("mkdir() failed: '%s'" % e)
-                    return False
-            self.METARELEASE_FILE = os.path.join(path,os.path.basename(self.METARELEASE_URI))
-        # if it is empty, remove it to avoid I-M-S hits on empty file
-        try:
-            if os.path.getsize(self.METARELEASE_FILE) == 0:
-                os.unlink(self.METARELEASE_FILE)
-        except Exception as e:
-            pass
-        return True
-
-    def dist_no_longer_supported(self, dist):
-        """ virtual function that is called when the distro is no longer
-            supported
-        """
-        self.no_longer_supported = dist
-    def new_dist_available(self, dist):
-        """ virtual function that is called when a new distro release
-            is available
-        """
-        self.new_dist = dist
-
-    def parse(self):
-        self._debug("MetaRelease.parse()")
-        current_dist_name = self.current_dist_name
-        self._debug("current dist name: '%s'" % current_dist_name)
-        current_dist = None
-        dists = []
-
-        # parse the metarelease_information file
-        index_tag = apt_pkg.TagFile(self.metarelease_information)
-        step_result = index_tag.step()
-        while step_result:
-            if "Dist" in index_tag.section:
-                name = index_tag.section["Dist"]
-                self._debug("found distro name: '%s'" % name)
-                rawdate = index_tag.section["Date"]
-                parseddate = list(email.utils.parsedate(rawdate))
-                parseddate[8] = 0  # assume no DST
-                date = time.mktime(tuple(parseddate))
-                supported = int(index_tag.section["Supported"])
-                version = index_tag.section["Version"]
-                # add the information to a new date object
-                dist = Dist(name, version, date,supported)
-                if "ReleaseNotes" in index_tag.section:
-                    dist.releaseNotesURI = index_tag.section["ReleaseNotes"]
-                    lang = get_lang()
-                    if lang:
-                        dist.releaseNotesURI += "?lang=%s" % lang
-                if "ReleaseNotesHtml" in index_tag.section:
-                    dist.releaseNotesHtmlUri = index_tag.section["ReleaseNotesHtml"]
-                    query = self._get_release_notes_uri_query_string(dist)
-                    if query:
-                        dist.releaseNotesHtmlUri += query
-                if "UpgradeTool" in index_tag.section:
-                    dist.upgradeTool =  index_tag.section["UpgradeTool"]
-                if "UpgradeToolSignature" in index_tag.section:
-                    dist.upgradeToolSig =  index_tag.section["UpgradeToolSignature"]
-                if "UpgradeBroken" in index_tag.section:
-                    dist.upgrade_broken = index_tag.section["UpgradeBroken"]
-                dists.append(dist)
-                if name == current_dist_name:
-                    current_dist = dist 
-            step_result = index_tag.step()
-
-        # first check if the current runing distro is in the meta-release
-        # information. if not, we assume that we run on something not
-        # supported and silently return
-        if current_dist is None:
-            self._debug("current dist not found in meta-release file\n")
-            return False
-
-        # then see what we can upgrade to 
-        upgradable_to = ""
-        for dist in dists:
-            if dist.date > current_dist.date:
-                upgradable_to = dist
-                self._debug("new dist: %s" % upgradable_to)
-                break
-
-        # only warn if unsupported and a new dist is available (because 
-        # the development version is also unsupported)
-        if upgradable_to != "" and not current_dist.supported:
-            self.upgradable_to = upgradable_to
-            self.dist_no_longer_supported(current_dist)
-        if upgradable_to != "":
-            self.upgradable_to = upgradable_to
-            self.new_dist_available(upgradable_to)
-
-        # parsing done and sucessfully
-        return True
-
-    # the network thread that tries to fetch the meta-index file
-    # can't touch the gui, runs as a thread
-    def download(self):
-        self._debug("MetaRelease.download()")
-        lastmodified = 0
-        req = Request(self.METARELEASE_URI)
-        # make sure that we always get the latest file (#107716)
-        req.add_header("Cache-Control", "No-Cache")
-        req.add_header("Pragma", "no-cache")
-        if os.access(self.METARELEASE_FILE, os.W_OK):
-            try:
-                lastmodified = os.stat(self.METARELEASE_FILE).st_mtime
-            except OSError as e:
-                pass
-        if lastmodified > 0 and not self.forceDownload:
-            req.add_header("If-Modified-Since", time.asctime(time.gmtime(lastmodified)))
-        try:
-            # open
-            uri=urlopen(req, timeout=20)
-            # sometime there is a root owned meta-relase file
-            # there, try to remove it so that we get it
-            # with proper permissions
-            if (os.path.exists(self.METARELEASE_FILE) and
-                not os.access(self.METARELEASE_FILE,os.W_OK)):
-                try:
-                    os.unlink(self.METARELEASE_FILE)
-                except OSError as e:
-                    print("Can't unlink '%s' (%s)" % (self.METARELEASE_FILE, e))
-            # we may get exception here on e.g. disk full
-            try:
-                f=open(self.METARELEASE_FILE,"w+b")
-                for line in uri.readlines():
-                    f.write(line)
-                f.flush()
-                f.seek(0,0)
-                self.metarelease_information=f
-            except IOError as e:
-                pass
-            uri.close()
-        # http error
-        except HTTPError as e:
-            # mvo: only reuse local info on "not-modified"
-            if e.code == 304 and os.path.exists(self.METARELEASE_FILE):
-                self._debug("reading file '%s'" % self.METARELEASE_FILE)
-                self.metarelease_information=open(self.METARELEASE_FILE,"r")
-            else:
-                self._debug("result of meta-release download: '%s'" % e)
-        # generic network error
-        except (URLError, BadStatusLine) as e:
-            self._debug("result of meta-release download: '%s'" % e)
-        # now check the information we have
-        if self.metarelease_information != None:
-            self._debug("have self.metarelease_information")
-            try:
-                self.parse()
-            except:
-                logging.exception("parse failed for '%s'" % self.METARELEASE_FILE)
-                # no use keeping a broken file around
-                os.remove(self.METARELEASE_FILE)
-            # we don't want to keep a meta-release file around when it
-            # has a "Broken" flag, this ensures we are not bitten by
-            # I-M-S/cache issues
-            if self.new_dist and self.new_dist.upgrade_broken:
-                os.remove(self.METARELEASE_FILE)
-        else:
-            self._debug("NO self.metarelease_information")
-        self.downloading = False
-
-    def _get_release_notes_uri_query_string(self, dist):
-        q = "?"
-        # get the lang
-        lang = get_lang()
-        if lang:
-            q += "lang=%s&" % lang
-        # get the os
-        os = get_ubuntu_flavor()
-        q += "os=%s&" % os
-        # get the version to upgrade to
-        q += "ver=%s" % dist.version
-        return q
-
-    def _debug(self, msg):
-        if self.DEBUG:
-            sys.stderr.write(msg+"\n")
-
-
-if __name__ == "__main__":
-    meta = MetaReleaseCore(False, False)
-    

=== removed file 'UpdateManager/Core/MyCache.py'
--- UpdateManager/Core/MyCache.py	2012-06-12 01:40:26 +0000
+++ UpdateManager/Core/MyCache.py	1970-01-01 00:00:00 +0000
@@ -1,366 +0,0 @@
-# MyCache.py 
-#  
-#  Copyright (c) 2004-2008 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
-
-import warnings
-warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning)
-import apt
-import apt_pkg
-import logging
-import os
-try:
-    from urllib.error import HTTPError
-    from urllib.request import urlopen
-    from urllib.parse import urlsplit
-except ImportError:
-    from urllib2 import HTTPError, urlopen
-    from urlparse import urlsplit
-try:
-    from http.client import BadStatusLine
-except ImportError:
-    from httplib import BadStatusLine
-import socket
-import re
-import DistUpgrade.DistUpgradeCache
-from gettext import gettext as _
-from .UpdateList import UpdateOrigin
-
-SYNAPTIC_PINFILE = "/var/lib/synaptic/preferences"
-CHANGELOGS_URI="http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/%s"
-
-class HttpsChangelogsUnsupportedError(Exception):
-    """ https changelogs with credentials are unsupported because of the
-        lack of certitifcation validation in urllib2 which allows MITM
-        attacks to steal the credentials
-    """
-    pass
-
-class MyCache(DistUpgrade.DistUpgradeCache.MyCache):
-
-    CHANGELOG_ORIGIN = "Ubuntu"
-
-    def __init__(self, progress, rootdir=None):
-        apt.Cache.__init__(self, progress, rootdir)
-        # raise if we have packages in reqreinst state
-        # and let the caller deal with that (runs partial upgrade)
-        assert len(self.req_reinstall_pkgs) == 0
-        # check if the dpkg journal is ok (we need to do that here
-        # too because libapt will only do it when it tries to lock
-        # the packaging system)
-        assert(not self._dpkgJournalDirty())
-        # init the regular cache
-        self._initDepCache()
-        self.all_changes = {}
-        self.all_news = {}
-        # on broken packages, try to fix via saveDistUpgrade()
-        if self._depcache.broken_count > 0:
-            self.saveDistUpgrade()
-        assert (self._depcache.broken_count == 0 and 
-                self._depcache.del_count == 0)
-
-    def _dpkgJournalDirty(self):
-        """
-        test if the dpkg journal is dirty
-        (similar to debSystem::CheckUpdates)
-        """
-        d = os.path.dirname(
-            apt_pkg.config.find_file("Dir::State::status"))+"/updates"
-        for f in os.listdir(d):
-            if re.match("[0-9]+", f):
-                return True
-        return False
-
-    def _initDepCache(self):
-        #apt_pkg.config.set("Debug::pkgPolicy","1")
-        #self.depcache = apt_pkg.GetDepCache(self.cache)
-        #self._depcache = apt_pkg.GetDepCache(self._cache)
-        self._depcache.read_pinfile()
-        if os.path.exists(SYNAPTIC_PINFILE):
-            self._depcache.read_pinfile(SYNAPTIC_PINFILE)
-        self._depcache.init()
-    def clear(self):
-        self._initDepCache()
-    @property
-    def required_download(self):
-        """ get the size of the packages that are required to download """
-        pm = apt_pkg.PackageManager(self._depcache)
-        fetcher = apt_pkg.Acquire()
-        pm.get_archives(fetcher, self._list, self._records)
-        return fetcher.fetch_needed
-    @property
-    def install_count(self):
-        return self._depcache.inst_count
-    def keep_count(self):
-        return self._depcache.keep_count
-    def saveDistUpgrade(self):
-        """ this functions mimics a upgrade but will never remove anything """
-        #self._apply_dselect_upgrade()
-        self._depcache.upgrade(True)
-        wouldDelete = self._depcache.del_count
-        if self._depcache.del_count > 0:
-            self.clear()
-        assert self._depcache.broken_count == 0 and self._depcache.del_count == 0
-        #self._apply_dselect_upgrade()
-        self._depcache.upgrade()
-        return wouldDelete
-    def match_package_origin(self, pkg, matcher):
-        """ match 'pkg' origin against 'matcher', take versions between
-            installed.version and candidate.version into account too
-            Useful if installed pkg A v1.0 is available in both
-            -updates (as v1.2) and -security (v1.1). we want to display
-            it as a security update then
-        """
-        inst_ver = pkg._pkg.current_ver
-        cand_ver = self._depcache.get_candidate_ver(pkg._pkg)
-        # init matcher with candidate.version
-        update_origin = matcher[(None,None)]
-        verFileIter = None
-        for (verFileIter,index) in cand_ver.file_list:
-            if (verFileIter.archive, verFileIter.origin) in matcher:
-                indexfile = pkg._pcache._list.find_index(verFileIter)
-                if indexfile: # and indexfile.IsTrusted:
-                    match = matcher[verFileIter.archive, verFileIter.origin]
-                    update_origin = match
-                    break
-        else:
-            # add a node for each origin/archive combination
-            if verFileIter and verFileIter.origin and verFileIter.archive:
-                matcher[verFileIter.archive, verFileIter.origin] = UpdateOrigin(_("Other updates (%s)") % verFileIter.origin, 0)
-                update_origin = matcher[verFileIter.archive, verFileIter.origin]
-        # if the candidate comes from a unknown source (e.g. a PPA) skip
-        # skip the shadow logic below as it would put e.g. a PPA package
-        # in "Recommended updates" when the version in the PPA 
-        # is higher than the one in %s-updates
-        if update_origin.importance <= 0:
-            return update_origin
-        # for known packages, check if we have higher versions that
-        # "shadow" this one
-        for ver in pkg._pkg.version_list:
-            # discard is < than installed ver
-            if (inst_ver and
-                apt_pkg.version_compare(ver.ver_str, inst_ver.ver_str) <= 0):
-                #print("skipping '%s' " % ver.ver_str)
-                continue
-            # check if we have a match
-            for(verFileIter,index) in ver.file_list:
-                if (verFileIter.archive, verFileIter.origin) in matcher:
-                    indexfile = pkg._pcache._list.find_index(verFileIter)
-                    if indexfile: # and indexfile.IsTrusted:
-                        match = matcher[verFileIter.archive, verFileIter.origin]
-                        if match.importance > update_origin.importance:
-                            update_origin = match
-        return update_origin
-
-    def _strip_epoch(self, verstr):
-        " strip of the epoch "
-        l = verstr.split(":")
-        if len(l) > 1:
-            verstr = "".join(l[1:])
-        return verstr
-        
-    def _get_changelog_or_news(self, name, fname, strict_versioning=False, changelogs_uri=None):
-        " helper that fetches the file in question "
-        # don't touch the gui in this function, it needs to be thread-safe
-        pkg = self[name]
-
-        # get the src package name
-        srcpkg = pkg.candidate.source_name
-
-        # assume "main" section 
-        src_section = "main"
-        # use the section of the candidate as a starting point
-        section = pkg._pcache._depcache.get_candidate_ver(pkg._pkg).section
-
-        # get the source version, start with the binaries version
-        srcver_epoch = pkg.candidate.version
-        srcver = self._strip_epoch(srcver_epoch)
-        #print("bin: %s" % binver)
-
-        l = section.split("/")
-        if len(l) > 1:
-            src_section = l[0]
-
-        # lib is handled special
-        prefix = srcpkg[0]
-        if srcpkg.startswith("lib"):
-            prefix = "lib" + srcpkg[3]
-
-        # the changelogs_uri argument overrides the default changelogs_uri,
-        # this is useful for e.g. PPAs where we construct the changelogs
-        # path differently
-        if changelogs_uri:
-            uri = changelogs_uri
-        else:
-            uri = CHANGELOGS_URI % (src_section,prefix,srcpkg,srcpkg, srcver, fname)
-
-        # https uris are not supported when they contain a username/password
-        # because the urllib2 https implementation will not check certificates
-        # and so its possible to do a man-in-the-middle attack to steal the
-        # credentials
-        res = urlsplit(uri)
-        if res.scheme == "https" and res.username != "":
-            raise HttpsChangelogsUnsupportedError(
-                "https locations with username/password are not"
-                "supported to fetch changelogs")
-
-        # print("Trying: %s " % uri)
-        changelog = urlopen(uri)
-        #print(changelog.read())
-        # do only get the lines that are new
-        alllines = ""
-        regexp = "^%s \((.*)\)(.*)$" % (re.escape(srcpkg))
-        
-        while True:
-            line = changelog.readline().decode("UTF-8", "replace")
-            if line == "":
-                break
-            match = re.match(regexp,line)
-            if match:
-                # strip epoch from installed version
-                # and from changelog too
-                installed = getattr(pkg.installed, "version", None)
-                if installed and ":" in installed:
-                    installed = installed.split(":",1)[1]
-                changelogver = match.group(1)
-                if changelogver and ":" in changelogver:
-                    changelogver = changelogver.split(":",1)[1]
-                # we test for "==" here for changelogs 
-                # to ensure that the version
-                # is actually really in the changelog - if not
-                # just display it all, this catches cases like:
-                # gcc-defaults with "binver=4.3.1" and srcver=1.76
-                # 
-                # for NEWS.Debian we do require the changelogver > installed
-                if strict_versioning:
-                    if (installed and 
-                        apt_pkg.version_compare(changelogver,installed)<0):
-                        break
-                else:
-                    if (installed and 
-                        apt_pkg.version_compare(changelogver,installed)==0):
-                        break
-            alllines = alllines + line
-        return alllines
-
-    def _guess_third_party_changelogs_uri_by_source(self, name):
-        pkg = self[name]
-        deb_uri = pkg.candidate.uri
-        if deb_uri is None:
-            return None
-        srcrec = pkg.candidate.record.get("Source")
-        if not srcrec:
-            return None
-        # srcpkg can be "apt" or "gcc-default (1.0)"
-        srcpkg = srcrec.split("(")[0].strip()
-        if "(" in srcrec:
-            srcver = srcrec.split("(")[1].rstrip(")")
-        else:
-            srcver = pkg.candidate.version
-        base_uri = deb_uri.rpartition("/")[0]
-        return base_uri + "/%s_%s.changelog" % (srcpkg, srcver)
-
-    def _guess_third_party_changelogs_uri_by_binary(self, name):
-        """ guess changelogs uri based on ArchiveURI by replacing .deb
-            with .changelog
-        """
-        # there is always a pkg and a pkg.candidate, no need to add
-        # check here
-        pkg = self[name]
-        deb_uri = pkg.candidate.uri
-        if deb_uri:
-            return "%s.changelog" % deb_uri.rsplit(".", 1)[0]
-        return None
-
-        
-    def get_news_and_changelog(self, name, lock):
-        self.get_news(name)
-        self.get_changelog(name)
-        try:
-            lock.release()        
-        except:
-            pass
-    
-    def get_news(self, name):
-        " get the NEWS.Debian file from the changelogs location "
-        try:
-            news = self._get_changelog_or_news(name, "NEWS.Debian", True)
-        except Exception:
-            return
-        if news:
-            self.all_news[name] = news
-                    
-    def _fetch_changelog_for_third_party_package(self, name):
-        # Try non official changelog location
-        changelogs_uri_binary = self._guess_third_party_changelogs_uri_by_binary(name)
-        changelogs_uri_source = self._guess_third_party_changelogs_uri_by_source(name)
-        error_message = ""
-        for changelogs_uri in [changelogs_uri_binary,changelogs_uri_source]:
-            if changelogs_uri:
-                try:
-                    changelog = self._get_changelog_or_news(
-                        name, "changelog", False, changelogs_uri)
-                    self.all_changes[name] += changelog
-                except (HTTPError, HttpsChangelogsUnsupportedError):
-                    # no changelogs_uri or 404
-                    error_message = _(
-                        "This update does not come from a "
-                        "source that supports changelogs.")
-                except (IOError, BadStatusLine, socket.error):
-                    # network errors and others
-                    logging.exception("error on changelog fetching")
-                    error_message = _(
-                        "Failed to download the list of changes. \n"
-                        "Please check your Internet connection.")
-        self.all_changes[name] += error_message
-
-    def get_changelog(self, name):
-        " get the changelog file from the changelog location "
-        origins = self[name].candidate.origins
-        self.all_changes[name] = _("Changes for the versions:\nInstalled version: %s\nAvailable version: %s\n\n") % (getattr(self[name].installed, "version", None), self[name].candidate.version)
-        if not self.CHANGELOG_ORIGIN in [o.origin for o in origins]:
-            self._fetch_changelog_for_third_party_package(name)
-            return
-        # fixup epoch handling version
-        srcpkg = self[name].candidate.source_name
-        srcver_epoch = self[name].candidate.version.replace(':', '%3A')
-        try:
-            changelog = self._get_changelog_or_news(name, "changelog")
-            if len(changelog) == 0:
-                changelog = _("The changelog does not contain any relevant changes.\n\n"
-                              "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-                              "until the changes become available or try again "
-                              "later.") % (srcpkg, srcver_epoch)
-        except HTTPError as e:
-            changelog = _("The list of changes is not available yet.\n\n"
-                          "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-                          "until the changes become available or try again "
-                          "later.") % (srcpkg, srcver_epoch)
-        except (IOError, BadStatusLine, socket.error) as e:
-            print("caught exception: ", e)
-            changelog = _("Failed to download the list "
-                          "of changes. \nPlease "
-                          "check your Internet "
-                          "connection.")
-        self.all_changes[name] += changelog
-
-
-

=== removed file 'UpdateManager/Core/UpdateList.py'
--- UpdateManager/Core/UpdateList.py	2012-06-12 13:17:46 +0000
+++ UpdateManager/Core/UpdateList.py	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-# UpdateList.py 
-#  
-#  Copyright (c) 2004-2008 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 print_function
-
-import warnings
-warnings.filterwarnings("ignore", "Accessed deprecated property", DeprecationWarning)
-
-from gettext import gettext as _
-import operator
-import subprocess
-import sys
-
-class UpdateOrigin(object):
-  def __init__(self, desc, importance):
-    self.packages = []
-    self.importance = importance
-    self.description = desc
-
-class UpdateList(object):
-  """
-  class that contains the list of available updates in 
-  self.pkgs[origin] where origin is the user readable string
-  """
-
-  def __init__(self, parent):
-    # a map of packages under their origin
-    try:
-        dist = subprocess.check_output(
-            ["lsb_release", "-c", "-s"], universal_newlines=True).strip()
-    except subprocess.CalledProcessError as e:
-        print("Error in lsb_release: %s" % e)
-        parent.error(_("Failed to detect distribution"),
-                     _("A error '%s' occurred while checking what system "
-                       "you are using.") % e)
-        sys.exit(1)
-    self.distUpgradeWouldDelete = 0
-    self.pkgs = {}
-    self.num_updates = 0
-    self.matcher = self.initMatcher(dist)
-    
-  def initMatcher(self, dist):
-      # (origin, archive, description, importance)
-      matcher_templates = [
-          ("%s-security" % dist, "Ubuntu", _("Important security updates"),10),
-          ("%s-updates" % dist, "Ubuntu", _("Recommended updates"), 9),
-          ("%s-proposed" % dist, "Ubuntu", _("Proposed updates"), 8),
-          ("%s-backports" % dist, "Ubuntu", _("Backports"), 7),
-          (dist, "Ubuntu", _("Distribution updates"), 6)
-      ]
-      matcher = {}
-      for (origin, archive, desc, importance) in matcher_templates:
-          matcher[(origin, archive)] = UpdateOrigin(desc, importance)
-      matcher[(None,None)] = UpdateOrigin(_("Other updates"), -1)
-      return matcher
-
-  def update(self, cache):
-    self.held_back = []
-
-    # do the upgrade
-    self.distUpgradeWouldDelete = cache.saveDistUpgrade()
-
-    #dselect_upgrade_origin = UpdateOrigin(_("Previous selected"), 1)
-
-    # sort by origin
-    for pkg in cache:
-      if pkg.is_upgradable or pkg.marked_install:
-        if getattr(pkg.candidate, "origins", None) == None:
-            # can happen for e.g. locked packages
-            # FIXME: do something more sensible here (but what?)
-            print("WARNING: upgradable but no candidate.origins?!?: ", pkg.name)
-            continue
-        # check where the package belongs
-        origin_node = cache.match_package_origin(pkg, self.matcher)
-        if origin_node not in self.pkgs:
-          self.pkgs[origin_node] = []
-        self.pkgs[origin_node].append(pkg)
-        self.num_updates = self.num_updates + 1
-      if pkg.is_upgradable and not (pkg.marked_upgrade or pkg.marked_install):
-          self.held_back.append(pkg.name)
-    for l in self.pkgs.keys():
-      self.pkgs[l].sort(key=operator.attrgetter("name"))
-    self.keepcount = cache._depcache.keep_count
-

=== removed file 'UpdateManager/Core/__init__.py'
=== removed file 'UpdateManager/Core/roam.py'
--- UpdateManager/Core/roam.py	2012-05-01 00:29:04 +0000
+++ UpdateManager/Core/roam.py	1970-01-01 00:00:00 +0000
@@ -1,205 +0,0 @@
-# utils.py 
-#  
-#  Copyright (c) 2011 Canonical
-#  
-#  Author:  Alex Chiang <[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
-
-import dbus
-import sys
-
-class ModemManagerHelper(object):
-
-    # data taken from 
-    #  http://projects.gnome.org/NetworkManager/developers/mm-spec-04.html
-    MM_DBUS_IFACE = "org.freedesktop.ModemManager"
-    MM_DBUS_IFACE_MODEM = MM_DBUS_IFACE + ".Modem"
-
-    # MM_MODEM_TYPE
-    MM_MODEM_TYPE_GSM = 1
-    MM_MODEM_TYPE_CDMA = 2
-
-    # GSM
-    # Not registered, not searching for new operator to register. 
-    MM_MODEM_GSM_NETWORK_REG_STATUS_IDLE = 0
-    # Registered on home network. 
-    MM_MODEM_GSM_NETWORK_REG_STATUS_HOME = 1
-    # Not registered, searching for new operator to register with. 
-    MM_MODEM_GSM_NETWORK_REG_STATUS_SEARCHING = 2
-    # Registration denied. 
-    MM_MODEM_GSM_NETWORK_REG_STATUS_DENIED = 3
-    # Unknown registration status. 
-    MM_MODEM_GSM_NETWORK_REG_STATUS_UNKNOWN = 4
-    # Registered on a roaming network. 
-    MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING = 5
-
-    # CDMA
-    # Registration status is unknown or the device is not registered.
-    MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN = 0
-    # Registered, but roaming status is unknown or cannot be provided 
-    # by the device. The device may or may not be roaming.
-    MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED = 1
-    #     Currently registered on the home network.
-    MM_MODEM_CDMA_REGISTRATION_STATE_HOME = 2
-    #     Currently registered on a roaming network.
-    MM_MODEM_CDMA_REGISTRATION_STATE_ROAMING = 3
-
-    def __init__(self):
-        self.bus = dbus.SystemBus()
-        self.proxy = self.bus.get_object("org.freedesktop.ModemManager", 
-                                         "/org/freedesktop/ModemManager")
-        modem_manager = dbus.Interface(self.proxy, self.MM_DBUS_IFACE)
-        self.modems = modem_manager.EnumerateDevices()
-
-    @staticmethod
-    def get_dbus_property(proxy, interface, property):
-        props = dbus.Interface(proxy, "org.freedesktop.DBus.Properties")
-        property = props.Get(interface, property)
-        return property
-
-    def is_gsm_roaming(self):
-        for m in self.modems:
-            dev = self.bus.get_object(self.MM_DBUS_IFACE, m)
-            type = self.get_dbus_property(dev, self.MM_DBUS_IFACE_MODEM, "Type")
-            if type != self.MM_MODEM_TYPE_GSM:
-                continue
-            net = dbus.Interface(dev, self.MM_DBUS_IFACE_MODEM + ".Gsm.Network")
-            reg = net.GetRegistrationInfo()
-            # Be conservative about roaming. If registration unknown, 
-            # assume yes.
-            # MM_MODEM_GSM_NETWORK_REG_STATUS
-            if reg[0] in (self.MM_MODEM_GSM_NETWORK_REG_STATUS_UNKNOWN,
-                          self.MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING):
-                return True
-        return False
-
-    def is_cdma_roaming(self):
-        for m in self.modems:
-            dev = self.bus.get_object(self.MM_DBUS_IFACE, m)
-            type = self.get_dbus_property(dev, self.MM_DBUS_IFACE_MODEM, "Type")
-            if type != self.MM_MODEM_TYPE_CDMA:
-                continue
-            cdma = dbus.Interface(dev, self.MM_DBUS_IFACE_MODEM + ".Cdma")
-            (cmda_1x, evdo) = cdma.GetRegistrationState()
-            # Be conservative about roaming. If registration unknown, 
-            # assume yes.
-            # MM_MODEM_CDMA_REGISTRATION_STATE
-            roaming_states = (self.MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED,
-                              self.MM_MODEM_CDMA_REGISTRATION_STATE_ROAMING)
-            # evdo trumps cmda_1x (thanks to Mathieu Trudel-Lapierre)
-            if evdo in roaming_states:
-                return True
-            elif cmda_1x in roaming_states:
-                return True
-        return False
-
-class NetworkManagerHelper(object):
-    NM_DBUS_IFACE = "org.freedesktop.NetworkManager"
-
-    # connection states
-    # Old enum values are for NM 0.7
-    
-    # The NetworkManager daemon is in an unknown state.
-    NM_STATE_UNKNOWN = 0
-    # The NetworkManager daemon is connecting a device.
-    NM_STATE_CONNECTING_OLD = 2
-    NM_STATE_CONNECTING = 40
-    NM_STATE_CONNECTING_LIST = [NM_STATE_CONNECTING_OLD,
-                                NM_STATE_CONNECTING]
-    # The NetworkManager daemon is connected.
-    NM_STATE_CONNECTED_OLD = 3
-    NM_STATE_CONNECTED_LOCAL = 50
-    NM_STATE_CONNECTED_SITE = 60
-    NM_STATE_CONNECTED_GLOBAL = 70
-    NM_STATE_CONNECTED_LIST = [NM_STATE_CONNECTED_OLD,
-                               NM_STATE_CONNECTED_LOCAL,
-                               NM_STATE_CONNECTED_SITE,
-                               NM_STATE_CONNECTED_GLOBAL]
-
-    # The device type is unknown. 
-    NM_DEVICE_TYPE_UNKNOWN = 0
-    # The device is wired Ethernet device. 
-    NM_DEVICE_TYPE_ETHERNET = 1
-    # The device is an 802.11 WiFi device. 
-    NM_DEVICE_TYPE_WIFI = 2
-    # The device is a GSM-based cellular WAN device. 
-    NM_DEVICE_TYPE_GSM = 3
-    # The device is a CDMA/IS-95-based cellular WAN device. 
-    NM_DEVICE_TYPE_CDMA = 4
-
-    def __init__(self):
-        self.bus = dbus.SystemBus()
-        self.proxy = self.bus.get_object("org.freedesktop.NetworkManager", 
-                                         "/org/freedesktop/NetworkManager")
-
-    @staticmethod
-    def get_dbus_property(proxy, interface, property):
-        props = dbus.Interface(proxy, "org.freedesktop.DBus.Properties")
-        property = props.Get(interface, property)
-        return property
-
-    def is_active_connection_gsm_or_cdma(self):
-        res = False
-        actives = self.get_dbus_property(
-            self.proxy, self.NM_DBUS_IFACE, 'ActiveConnections')
-        for a in actives:
-            active = self.bus.get_object(self.NM_DBUS_IFACE, a)
-            default_route = self.get_dbus_property(
-                active, self.NM_DBUS_IFACE + ".Connection.Active", 'Default')
-            if not default_route:
-                continue
-            devs = self.get_dbus_property(
-                active, self.NM_DBUS_IFACE + ".Connection.Active", 'Devices')
-            for d in devs:
-                dev = self.bus.get_object(self.NM_DBUS_IFACE, d)
-                type = self.get_dbus_property(
-                    dev, self.NM_DBUS_IFACE + ".Device", 'DeviceType')
-                if type == self.NM_DEVICE_TYPE_GSM:
-                    return True
-                elif type == self.NM_DEVICE_TYPE_CDMA:
-                    return True
-                else:
-                    continue
-        return res
-
-    def is_active_connection_gsm_or_cdma_roaming(self):
-        res = False
-        if self.is_active_connection_gsm_or_cdma():
-            mmhelper = ModemManagerHelper()
-            res |= mmhelper.is_gsm_roaming()
-            res |= mmhelper.is_cdma_roaming()
-        return res
-
-if __name__ == "__main__":
-    
-    # test code
-    if sys.argv[1:] and sys.argv[1] == "--test":
-        mmhelper = ModemManagerHelper()
-        print("is_gsm_roaming", mmhelper.is_gsm_roaming())
-        print("is_cdma_romaing", mmhelper.is_cdma_roaming())
-
-    # roaming?
-    nmhelper = NetworkManagerHelper()
-    is_roaming = nmhelper.is_active_connection_gsm_or_cdma_roaming()
-    print("roam: ", is_roaming)
-    if is_roaming:
-        sys.exit(1)
-    sys.exit(0)

=== removed file 'UpdateManager/Core/utils.py'
--- UpdateManager/Core/utils.py	2012-06-15 20:13:15 +0000
+++ UpdateManager/Core/utils.py	1970-01-01 00:00:00 +0000
@@ -1,510 +0,0 @@
-# utils.py 
-#  
-#  Copyright (c) 2004-2008 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 print_function
-
-from gettext import gettext as _
-from gettext import ngettext
-from stat import (S_IMODE, ST_MODE, S_IXUSR)
-from math import ceil
-
-import apt_pkg
-apt_pkg.init_config()
-
-import locale
-import logging
-import re
-import os
-import glob
-import subprocess
-import sys
-import time
-try:
-    from urllib.request import (
-        ProxyHandler,
-        Request,
-        build_opener,
-        install_opener,
-        urlopen,
-        )
-    from urllib.parse import urlsplit
-except ImportError:
-    from urllib2 import (
-        ProxyHandler,
-        Request,
-        build_opener,
-        install_opener,
-        urlopen,
-        )
-    from urlparse import urlsplit
-
-from copy import copy
-
-
-class ExecutionTime(object):
-    """
-    Helper that can be used in with statements to have a simple
-    measure of the timing of a particular block of code, e.g.
-    with ExecutionTime("db flush"):
-        db.flush()
-    """
-    def __init__(self, info=""):
-        self.info = info
-    def __enter__(self):
-        self.now = time.time()
-    def __exit__(self, type, value, stack):
-        print("%s: %s" % (self.info, time.time() - self.now))
-
-def get_string_with_no_auth_from_source_entry(entry):
-    tmp = copy(entry)
-    url_parts = urlsplit(tmp.uri)
-    if url_parts.username:
-        tmp.uri = tmp.uri.replace(url_parts.username, "hidden-u")
-    if url_parts.password:
-        tmp.uri = tmp.uri.replace(url_parts.password, "hidden-p")
-    return str(tmp)
-
-def estimate_kernel_size_in_boot():
-    """ estimate the amount of space that the current kernel takes in /boot """
-    size = 0
-    kver = os.uname()[2]
-    for f in glob.glob("/boot/*%s*" % kver):
-        size += os.path.getsize(f)
-    return size
-
-def is_unity_running():
-    """ return True if Unity is currently running """
-    unity_running = False
-    try:
-        import dbus
-        bus = dbus.SessionBus()
-        unity_running = bus.name_has_owner("com.canonical.Unity")
-    except:
-        logging.exception("could not check for Unity dbus service")
-    return unity_running
-
-def is_child_of_process_name(processname, pid=None):
-    if not pid:
-        pid = os.getpid()
-    while pid > 0:
-        stat_file = "/proc/%s/stat" % pid
-        with open(stat_file) as stat_f:
-            stat = stat_f.read()
-        # extract command (inside ())
-        command = stat.partition("(")[2].partition(")")[0]
-        if command == processname:
-            return True
-        # get parent (second to the right of command) and check that next
-        pid = int(stat.partition(")")[2].split()[1])
-    return False
-
-def inside_chroot():
-    """ returns True if we are inside a chroot 
-    """
-    # if there is no proc or no pid 1 we are very likely inside a chroot
-    if not os.path.exists("/proc") or not os.path.exists("/proc/1"):
-        return True
-    # if the inode is differnt for pid 1 "/" and our "/"
-    return os.stat("/") != os.stat("/proc/1/root")
-
-def wrap(t, width=70, subsequent_indent=""):
-    """ helpers inspired after textwrap - unfortunately
-        we can not use textwrap directly because it break
-        packagenames with "-" in them into new lines
-    """
-    out = ""
-    for s in t.split():
-        if (len(out)-out.rfind("\n")) + len(s) > width:
-            out += "\n" + subsequent_indent
-        out += s + " "
-    return out
-    
-def twrap(s, **kwargs):
-    msg = ""
-    paras = s.split("\n")
-    for par in paras:
-        s = wrap(par, **kwargs)
-        msg += s+"\n"
-    return msg
-
-def lsmod():
-  " return list of loaded modules (or [] if lsmod is not found) "
-  modules=[]
-  # FIXME raise?
-  if not os.path.exists("/sbin/lsmod"):
-    return []
-  p=subprocess.Popen(["/sbin/lsmod"], stdout=subprocess.PIPE,
-                     universal_newlines=True)
-  lines=p.communicate()[0].split("\n")
-  # remove heading line: "Modules Size Used by"
-  del lines[0]
-  # add lines to list, skip empty lines
-  for line in lines:
-    if line:
-      modules.append(line.split()[0])
-  return modules
-
-def check_and_fix_xbit(path):
-  " check if a given binary has the executable bit and if not, add it"
-  if not os.path.exists(path):
-    return
-  mode = S_IMODE(os.stat(path)[ST_MODE])
-  if not ((mode & S_IXUSR) == S_IXUSR):
-    os.chmod(path, mode | S_IXUSR)
-
-def country_mirror():
-  " helper to get the country mirror from the current locale "
-  # special cases go here
-  lang_mirror = { 'c'     : '',
-                }
-  # no lang, no mirror
-  if not 'LANG' in os.environ:
-    return ''
-  lang = os.environ['LANG'].lower()
-  # check if it is a special case
-  if lang[:5] in lang_mirror:
-    return lang_mirror[lang[:5]]
-  # now check for the most comon form (en_US.UTF-8)
-  if "_" in lang:
-    country = lang.split(".")[0].split("_")[1]
-    if "@" in country:
-       country = country.split("@")[0]
-    return country+"."
-  else:
-    return lang[:2]+"."
-  return ''
-
-def get_dist():
-  " return the codename of the current runing distro "
-  # support debug overwrite
-  dist = os.environ.get("META_RELEASE_FAKE_CODENAME")
-  if dist:
-      logging.warn("using fake release name '%s' (because of META_RELEASE_FAKE_CODENAME environment) " % dist)
-      return dist
-  # then check the real one
-  from subprocess import Popen, PIPE
-  p = Popen(["lsb_release","-c","-s"], stdout=PIPE, universal_newlines=True)
-  res = p.wait()
-  if res != 0:
-    sys.stderr.write("lsb_release returned exitcode: %i\n" % res)
-    return "unknown distribution"
-  dist = p.stdout.readline().strip()
-  p.stdout.close()
-  return dist
-
-def get_dist_version():
-  " return the version of the current running distro "
-  # support debug overwrite
-  desc = os.environ.get("META_RELEASE_FAKE_VERSION")
-  if desc:
-      logging.warn("using fake release version '%s' (because of META_RELEASE_FAKE_VERSION environment) " % desc)
-      return desc
-  # then check the real one
-  from subprocess import Popen, PIPE
-  p = Popen(["lsb_release","-r","-s"], stdout=PIPE, universal_newlines=True)
-  res = p.wait()
-  if res != 0:
-    sys.stderr.write("lsb_release returned exitcode: %i\n" % res)
-    return "unknown distribution"
-  desc = p.stdout.readline().strip()
-  p.stdout.close()
-  return desc
-
-class HeadRequest(Request):
-    def get_method(self):
-        return "HEAD"
-
-def url_downloadable(uri, debug_func=None):
-  """
-  helper that checks if the given uri exists and is downloadable
-  (supports optional debug_func function handler to support 
-   e.g. logging)
-
-  Supports http (via HEAD) and ftp (via size request)
-  """
-  if not debug_func:
-      lambda x: True
-  debug_func("url_downloadable: %s" % uri)
-  (scheme, netloc, path, querry, fragment) = urlsplit(uri)
-  debug_func("s='%s' n='%s' p='%s' q='%s' f='%s'" % (scheme, netloc, path, querry, fragment))
-  if scheme == "http":
-    try:
-        http_file = urlopen(HeadRequest(uri))
-        http_file.close()
-        if http_file.code == 200:
-            return True
-        return False
-    except Exception as e:
-      debug_func("error from httplib: '%s'" % e)
-      return False
-  elif scheme == "ftp":
-    import ftplib
-    try:
-      f = ftplib.FTP(netloc)
-      f.login()
-      f.cwd(os.path.dirname(path))
-      size = f.size(os.path.basename(path))
-      f.quit()
-      if debug_func:
-        debug_func("ftplib.size() returned: %s" % size)
-      if size != 0:
-        return True
-    except Exception as e:
-      if debug_func:
-        debug_func("error from ftplib: '%s'" % e)
-      return False
-  return False
-
-def init_proxy(gsettings=None):
-  """ init proxy settings 
-
-  * first check for http_proxy environment (always wins),
-  * then check the apt.conf http proxy, 
-  * then look into synaptics conffile
-  * then into gconf  (if gconfclient was supplied)
-  """
-  SYNAPTIC_CONF_FILE = "/root/.synaptic/synaptic.conf"
-  proxy = None
-  # generic apt config wins
-  if apt_pkg.config.find("Acquire::http::Proxy") != '':
-    proxy = apt_pkg.config.find("Acquire::http::Proxy")
-  # then synaptic
-  elif os.path.exists(SYNAPTIC_CONF_FILE):
-    cnf = apt_pkg.Configuration()
-    apt_pkg.read_config_file(cnf, SYNAPTIC_CONF_FILE)
-    use_proxy = cnf.find_b("Synaptic::useProxy", False)
-    if use_proxy:
-      proxy_host = cnf.find("Synaptic::httpProxy")
-      proxy_port = str(cnf.find_i("Synaptic::httpProxyPort"))
-      if proxy_host and proxy_port:
-        proxy = "http://%s:%s/" % (proxy_host, proxy_port)
-  # gconf is no more
-  # elif gconfclient:
-  #   try: # see LP: #281248
-  #     if gconfclient.get_bool("/system/http_proxy/use_http_proxy"):
-  #       host = gconfclient.get_string("/system/http_proxy/host")
-  #       port = gconfclient.get_int("/system/http_proxy/port")
-  #       use_auth = gconfclient.get_bool("/system/http_proxy/use_authentication")
-  #       if host and port:
-  #         if use_auth:
-  #           auth_user = gconfclient.get_string("/system/http_proxy/authentication_user")
-  #           auth_pw = gconfclient.get_string("/system/http_proxy/authentication_password")
-  #           proxy = "http://%s:%s@%s:%s/" % (auth_user,auth_pw,host, port)
-  #         else:
-  #           proxy = "http://%s:%s/" % (host, port)
-  #   except Exception as e:
-  #     print("error from gconf: %s" % e)
-  # if we have a proxy, set it
-  if proxy:
-    # basic verification
-    if not re.match("http://\w+", proxy):
-      print("proxy '%s' looks invalid" % proxy, file=sys.stderr)
-      return
-    proxy_support = ProxyHandler({"http":proxy})
-    opener = build_opener(proxy_support)
-    install_opener(opener)
-    os.putenv("http_proxy",proxy)
-  return proxy
-
-def on_battery():
-  """
-  Check via dbus if the system is running on battery.
-  This function is using UPower per default, if UPower is not
-  available it falls-back to DeviceKit.Power. 
-  """
-  try:
-    import dbus
-    bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
-    try:
-        devobj = bus.get_object('org.freedesktop.UPower', 
-                                '/org/freedesktop/UPower')
-        dev = dbus.Interface(devobj, 'org.freedesktop.DBus.Properties')
-        return dev.Get('org.freedesktop.UPower', 'OnBattery')
-    except dbus.exceptions.DBusException as e:
-        if e._dbus_error_name != 'org.freedesktop.DBus.Error.ServiceUnknown':
-            raise
-        devobj = bus.get_object('org.freedesktop.DeviceKit.Power', 
-                                '/org/freedesktop/DeviceKit/Power')
-        dev = dbus.Interface(devobj, "org.freedesktop.DBus.Properties")
-        return dev.Get("org.freedesktop.DeviceKit.Power", "on_battery")
-  except Exception as e:
-    #import sys
-    #print("on_battery returned error: ", e, file=sys.stderr)
-    return False
-
-def inhibit_sleep():
-  """
-  Send a dbus signal to power-manager to not suspend
-  the system, using the freedesktop common interface
-  """
-  try:
-    import dbus
-    bus = dbus.Bus(dbus.Bus.TYPE_SESSION)
-    devobj = bus.get_object('org.freedesktop.PowerManagement', 
-                          '/org/freedesktop/PowerManagement/Inhibit')
-    dev = dbus.Interface(devobj, "org.freedesktop.PowerManagement.Inhibit")
-    cookie = dev.Inhibit('UpdateManager', 'Updating system')
-    return (dev, cookie)
-  except Exception:
-    #print("could not send the dbus Inhibit signal: %s" % e)
-    return (False, False)
-
-def allow_sleep(dev, cookie):
-  """Send a dbus signal to gnome-power-manager to allow a suspending
-  the system"""
-  try:
-    dev.UnInhibit(cookie)
-  except Exception as e:
-    print("could not send the dbus UnInhibit signal: %s" % e)
-
-
-def str_to_bool(str):
-  if str == "0" or str.upper() == "FALSE":
-    return False
-  return True
-
-def get_lang():
-    import logging
-    try:
-        (locale_s, encoding) = locale.getdefaultlocale()
-        return locale_s
-    except Exception: 
-        logging.exception("gedefaultlocale() failed")
-        return None
-
-def get_ubuntu_flavor():
-    """ try to guess the flavor based on the running desktop """
-    # this will (of course) not work in a server environment, 
-    # but the main use case for this is to show the right
-    # release notes
-    # TODO: actually examine which meta packages are installed, like
-    # DistUpgrade/DistUpgradeCache.py does and use that to choose a flavor.
-    denv = os.environ.get("DESKTOP_SESSION", "")
-    if "gnome" in denv:
-        return "ubuntu"
-    elif "kde" in denv:
-        return "kubuntu"
-    elif "xfce" in denv or "xubuntu" in denv:
-        return "xubuntu"
-    elif "LXDE" in denv or "Lubuntu" in denv:
-        return "lubuntu"
-    # default to ubuntu if nothing more specific is found
-    return "ubuntu"
-
-def get_ubuntu_flavor_name():
-    flavor = get_ubuntu_flavor()
-    if flavor == "kubuntu":
-        return "Kubuntu"
-    elif flavor == "xubuntu":
-        return "Xubuntu"
-    elif flavor == "lubuntu":
-        return "Lubuntu"
-    else:
-        return "Ubuntu"
-
-def error(parent, summary, message):
-  from gi.repository import Gtk, Gdk
-  d = Gtk.MessageDialog(parent=parent,
-                        flags=Gtk.DialogFlags.MODAL,
-                        type=Gtk.MessageType.ERROR,
-                        buttons=Gtk.ButtonsType.CLOSE)
-  d.set_markup("<big><b>%s</b></big>\n\n%s" % (summary, message))
-  d.realize()
-  d.window.set_functions(Gdk.FUNC_MOVE)
-  d.set_title("")
-  d.run()
-  d.destroy()
-  return False
-
-def humanize_size(bytes):
-    """
-    Convert a given size in bytes to a nicer better readable unit
-    """
-
-    if bytes < 1000 * 1000:
-        # to have 0 for 0 bytes, 1 for 0-1000 bytes and for 1 and above round up
-        size_in_kb = int(ceil(bytes/float(1000)));
-        # TRANSLATORS: download size of small updates, e.g. "250 kB"
-        return ngettext("%(size).0f kB", "%(size).0f kB", size_in_kb) % { "size" : size_in_kb }
-    else:
-        # TRANSLATORS: download size of updates, e.g. "2.3 MB"
-        return locale.format_string(_("%.1f MB"), bytes / 1000.0 / 1000.0)
-
-def get_arch():
-    return apt_pkg.config.find("APT::Architecture")
-
-
-def is_port_already_listening(port):
-    """ check if the current system is listening on the given tcp port """
-    # index in the line
-    INDEX_LOCAL_ADDR = 1
-    #INDEX_REMOTE_ADDR = 2
-    INDEX_STATE = 3
-    # state (st) that we care about
-    STATE_LISTENING = '0A'
-    # read the data
-    with open("/proc/net/tcp") as net_tcp:
-        for line in net_tcp:
-            line = line.strip()
-            if not line:
-                continue
-            # split, values are:
-            #   sl  local_address rem_address   st tx_queue rx_queue tr tm->when retrnsmt   uid  timeout inode                                                     
-            values = line.split()
-            state = values[INDEX_STATE]
-            if state != STATE_LISTENING:
-                continue
-            local_port_str = values[INDEX_LOCAL_ADDR].split(":")[1]
-            local_port = int(local_port_str, 16)
-            if local_port == port:
-                return True
-    return False
-
-
-def iptables_active():
-    """ Return True if iptables is active """
-    # FIXME: is there a better way?
-    iptables_empty="""Chain INPUT (policy ACCEPT)
-target     prot opt source               destination         
-
-Chain FORWARD (policy ACCEPT)
-target     prot opt source               destination         
-
-Chain OUTPUT (policy ACCEPT)
-target     prot opt source               destination         
-"""
-    if os.getuid() != 0:
-        raise OSError("Need root to check the iptables state")
-    if not os.path.exists("/sbin/iptables"):
-        return False
-    out = subprocess.Popen(["iptables", "-L"], 
-                           stdout=subprocess.PIPE,
-                           universal_newlines=True).communicate()[0]
-    if out == iptables_empty:
-        return False
-    return True
-
-
-if __name__ == "__main__":
-  #print(mirror_from_sources_list())
-  #print(on_battery())
-  #print(inside_chroot())
-  print(iptables_active())

=== removed file 'UpdateManager/Dialogs.py'
--- UpdateManager/Dialogs.py	2012-06-27 13:39:33 +0000
+++ UpdateManager/Dialogs.py	1970-01-01 00:00:00 +0000
@@ -1,235 +0,0 @@
-# Dialogs.py
-# -*- coding: utf-8 -*-
-#  
-#  Copyright (c) 2012 Canonical
-#  
-#  Author: Michael Terry <[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
-from gi.repository import GObject
-GObject.threads_init()
-
-import warnings
-warnings.filterwarnings("ignore", "Accessed deprecated property", DeprecationWarning)
-
-import dbus
-import os
-import subprocess
-import sys
-import time
-from .SimpleGtk3builderApp import SimpleGtkbuilderApp
-from .DistUpgradeFetcher import DistUpgradeFetcherGtk
-from .GtkProgress import GtkAcquireProgress
-
-from gettext import gettext as _
-
-class Dialog(SimpleGtkbuilderApp):
-  def __init__(self, window_main):
-    self.window_main = window_main
-    self.focus_button = None
-    SimpleGtkbuilderApp.__init__(self, self.window_main.datadir+"/gtkbuilder/Dialog.ui",
-                                 "update-manager")
-
-  def main(self):
-    self.window_main.push(self.pane_dialog, self)
-    if self.focus_button:
-      self.focus_button.grab_focus()
-
-  def run(self, parent=None):
-    if self.focus_button:
-      self.focus_button.grab_focus()
-    if parent:
-      self.window_dialog.set_transient_for(parent)
-      self.window_dialog.set_modal(True)
-    self.window_dialog.run()
-
-  def close(self):
-    sys.exit(0) # By default, exit the app
-
-  def add_button(self, label, callback, secondary=False):
-    # from_stock tries stock first and falls back to mnemonic
-    button = Gtk.Button.new_from_stock(label)
-    button.connect("clicked", lambda x: callback())
-    button.show()
-    self.buttonbox.add(button)
-    self.buttonbox.set_child_secondary(button, secondary)
-    return button
-
-  def add_settings_button(self):
-    if os.path.exists("/usr/bin/software-properties-gtk"):
-      return self.add_button(_("Settings…"), self.on_settings_button_clicked, secondary=True)
-    else:
-      return None
-
-  def on_settings_button_clicked(self):
-    cmd = ["/usr/bin/software-properties-gtk",
-           "--open-tab","2",
-           # FIXME: once get_xid() is available via introspections, add 
-           #        this back
-           #"--toplevel", "%s" % self.window_main.get_window().get_xid() 
-          ]
-    self.window_main.set_sensitive(False)
-    p = subprocess.Popen(cmd)
-    while p.poll() is None:
-        while Gtk.events_pending():
-            Gtk.main_iteration()
-        time.sleep(0.05)
-    self.window_main.set_sensitive(True)
-
-  def set_header(self, label):
-    self.label_header.set_label(label)
-
-  def set_desc(self, label):
-    self.label_desc.set_label(label)
-    self.label_desc.set_visible(bool(label))
-
-
-class NoUpdatesDialog(Dialog):
-  def __init__(self, window_main):
-    Dialog.__init__(self, window_main)
-    self.set_header(_("The software on this computer is up to date."))
-    self.add_settings_button()
-    self.focus_button = self.add_button(Gtk.STOCK_OK, self.close)
-
-
-class DistUpgradeDialog(Dialog):
-  def __init__(self, window_main, meta_release):
-    Dialog.__init__(self, window_main)
-    self.meta_release = meta_release
-    self.set_header(_("The software on this computer is up to date."))
-    # Translators: these are Ubuntu version names like "Ubuntu 12.04"
-    self.set_desc(_("However, %s %s is now available (you have %s).") % (
-                  meta_release.flavor_name,
-                  meta_release.upgradable_to.version,
-                  meta_release.current_dist_version))
-    self.add_settings_button()
-    self.add_button(_("Upgrade…"), self.upgrade)
-    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()
-
-
-class UnsupportedDialog(DistUpgradeDialog):
-  def __init__(self, window_main, meta_release):
-    DistUpgradeDialog.__init__(self, window_main, meta_release)
-    # Translators: this is an Ubuntu version name like "Ubuntu 12.04"
-    self.set_header(_("Software updates are no longer provided for %s %s.") % (
-                    meta_release.flavor_name,
-                    meta_release.current_dist_version))
-    # Translators: this is an Ubuntu version name like "Ubuntu 12.04"
-    self.set_desc(_("To stay secure, you should upgrade to %s %s.") % (
-                  meta_release.flavor_name,
-                  meta_release.upgradable_to.version))
-
-  def run(self, parent):
-    # This field is used in tests/test_end_of_life.py
-    self.window_main.no_longer_supported_nag = self.window_dialog
-    DistUpgradeDialog.run(self, parent)
-
-
-class PartialUpgradeDialog(Dialog):
-  def __init__(self, window_main):
-    Dialog.__init__(self, window_main)
-    self.set_header(_("Not all updates can be installed"))
-    self.set_desc(_("""Run a partial upgrade, to install as many updates as possible. 
-
-This can be caused by:
- * A previous upgrade which didn't complete
- * Problems with some of the installed software
- * Unofficial software packages not provided by Ubuntu
- * Normal changes of a pre-release version of Ubuntu"""))
-    self.add_settings_button()
-    self.add_button(_("_Partial Upgrade"), self.upgrade)
-    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")
-
-  def main(self):
-    Dialog.main(self)
-    # Block progress until user has answered this question
-    Gtk.main()
-
-
-class ErrorDialog(Dialog):
-  def __init__(self, window_main, header, desc=None):
-    Dialog.__init__(self, window_main)
-    self.set_header(header)
-    if desc:
-      self.set_desc(desc)
-      self.label_desc.set_selectable(True)
-    self.add_settings_button()
-    self.focus_button = self.add_button(Gtk.STOCK_OK, self.close)
-
-  def main(self):
-    Dialog.main(self)
-    # The label likes to start selecting everything (b/c it got focus before
-    # we switched to our default button).
-    self.label_desc.select_region(0, 0)
-    # Since errors usually are outside the normal flow, we'll guarantee that
-    # we don't continue with normal code flow by running our own loop here.
-    # We won't screw anything up because the only thing this dialog will do
-    # is exit.
-    Gtk.main()
-
-
-class NeedRestartDialog(Dialog):
-  def __init__(self, window_main):
-    Dialog.__init__(self, window_main)
-    self.set_header(_("The computer needs to restart to finish installing updates."))
-    self.focus_button = self.add_button(_("_Restart"), self.restart)
-
-  def restart(self, *args, **kwargs):
-    self._request_reboot_via_session_manager()
-
-  def _request_reboot_via_session_manager(self):
-    try:
-        bus = dbus.SessionBus()
-        proxy_obj = bus.get_object("org.gnome.SessionManager",
-                                   "/org/gnome/SessionManager")
-        iface = dbus.Interface(proxy_obj, "org.gnome.SessionManager")
-        iface.RequestReboot()
-    except dbus.DBusException:
-        self._request_reboot_via_consolekit()
-    except:
-        pass
-
-  def _request_reboot_via_consolekit(self):
-    try:
-        bus = dbus.SystemBus()
-        proxy_obj = bus.get_object("org.freedesktop.ConsoleKit",
-                                   "/org/freedesktop/ConsoleKit/Manager")
-        iface = dbus.Interface(proxy_obj, "org.freedesktop.ConsoleKit.Manager")
-        iface.Restart()
-    except dbus.DBusException:
-        pass
-

=== removed file 'UpdateManager/DistUpgradeFetcher.py'
--- UpdateManager/DistUpgradeFetcher.py	2012-06-15 20:02:33 +0000
+++ UpdateManager/DistUpgradeFetcher.py	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-# DistUpgradeFetcher.py 
-#  
-#  Copyright (c) 2006 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
-
-from .ReleaseNotesViewer import ReleaseNotesViewer
-from .Core.utils import error, inhibit_sleep, allow_sleep
-from .Core.DistUpgradeFetcherCore import DistUpgradeFetcherCore
-from .SimpleGtk3builderApp import SimpleGtkbuilderApp
-from gettext import gettext as _
-try:
-    from urllib.request import urlopen
-    from urllib.error import HTTPError
-except ImportError:
-    from urllib2 import urlopen, HTTPError
-import os
-import socket
-
-
-class DistUpgradeFetcherGtk(DistUpgradeFetcherCore):
-
-    def __init__(self, new_dist, progress, parent, datadir):
-        DistUpgradeFetcherCore.__init__(self,new_dist,progress)
-        uifile = datadir + "gtkbuilder/ReleaseNotes.ui"
-        self.widgets = SimpleGtkbuilderApp(uifile, "update-manager")
-        self.window_main = parent
-
-    def error(self, summary, message):
-        return error(self.window_main, summary, message)
-
-    def runDistUpgrader(self):
-        inhibit_sleep()
-        # now run it with sudo
-        if os.getuid() != 0:
-            os.execv("/usr/bin/gksu",["gksu",
-                                      "--desktop","/usr/share/applications/update-manager.desktop",
-                                      "--",
-                                      self.script]+self.run_options)
-        else:
-            os.execv(self.script,[self.script]+self.run_options)
-        # we shouldn't come to this point, but if we do, undo our
-        # inhibit sleep
-        allow_sleep()
-
-    def showReleaseNotes(self):
-      # first try showing the webkit version, this may fail (return None
-      # because e.g. there is no webkit installed)
-      res = self._try_show_release_notes_webkit()
-      if res is not None:
-          return res
-      else:
-          # fallback to text
-          return self._try_show_release_notes_textview()
-
-    def _try_show_release_notes_webkit(self):
-      if self.new_dist.releaseNotesHtmlUri is not None:
-          try:
-              from .ReleaseNotesViewerWebkit import ReleaseNotesViewerWebkit
-              webkit_release_notes = ReleaseNotesViewerWebkit(self.new_dist.releaseNotesHtmlUri)
-              webkit_release_notes.show()
-              self.widgets.scrolled_notes.add(webkit_release_notes)
-              res = self.widgets.dialog_release_notes.run()
-              self.widgets.dialog_release_notes.hide()
-              if res == Gtk.ResponseType.OK:
-                  return True
-              return False
-          except ImportError:
-              pass
-      return None
-
-    def _try_show_release_notes_textview(self):
-      # FIXME: care about i18n! (append -$lang or something)
-      if self.new_dist.releaseNotesURI != 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))
-          while Gtk.events_pending():
-              Gtk.main_iteration()
-
-          # download/display the release notes
-          # FIXME: add some progress reporting here
-          res = Gtk.ResponseType.CANCEL
-          timeout = socket.getdefaulttimeout()
-          try:
-              socket.setdefaulttimeout(5)
-              release_notes = urlopen(uri)
-              notes = release_notes.read().decode("UTF-8", "replace")
-              textview_release_notes = ReleaseNotesViewer(notes)
-              textview_release_notes.show()
-              self.widgets.scrolled_notes.add(textview_release_notes)
-              self.widgets.dialog_release_notes.set_transient_for(self.window_main)
-              res = self.widgets.dialog_release_notes.run()
-              self.widgets.dialog_release_notes.hide()
-          except HTTPError:
-              primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
-                        _("Could not find the release notes")
-              secondary = _("The server may be overloaded. ")
-              dialog = Gtk.MessageDialog(self.window_main,Gtk.DialogFlags.MODAL,
-                                         Gtk.MessageType.ERROR,Gtk.ButtonsType.CLOSE,"")
-              dialog.set_title("")
-              dialog.set_markup(primary);
-              dialog.format_secondary_text(secondary);
-              dialog.run()
-              dialog.destroy()
-          except IOError:
-              primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
-                        _("Could not download the release notes")
-              secondary = _("Please check your internet connection.")
-              dialog = Gtk.MessageDialog(self.window_main,Gtk.DialogFlags.MODAL,
-                                         Gtk.MessageType.ERROR,Gtk.ButtonsType.CLOSE,"")
-              dialog.set_title("")
-              dialog.set_markup(primary);
-              dialog.format_secondary_text(secondary);
-              dialog.run()
-              dialog.destroy()
-          socket.setdefaulttimeout(timeout)              
-          self.window_main.set_sensitive(True)
-          self.window_main.get_window().set_cursor(None)
-          # user clicked cancel
-          if res == Gtk.ResponseType.OK:
-              return True
-      return False
-

=== removed file 'UpdateManager/DistUpgradeFetcherKDE.py'
--- UpdateManager/DistUpgradeFetcherKDE.py	2012-06-12 01:40:26 +0000
+++ UpdateManager/DistUpgradeFetcherKDE.py	1970-01-01 00:00:00 +0000
@@ -1,188 +0,0 @@
-# DistUpgradeFetcherKDE.py 
-#
-#  Copyright (c) 2008 Canonical Ltd
-#
-#  Author: Jonathan Riddell <[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, see <http://www.gnu.org/licenses/>.
-
-from __future__ import absolute_import
-
-from PyKDE4.kdecore import ki18n, KAboutData, KCmdLineOptions, KCmdLineArgs
-from PyKDE4.kdeui import KIcon, KMessageBox, KApplication, KStandardGuiItem
-from PyQt4.QtCore import QDir, QTimer
-from PyQt4.QtGui import QDialog, QDialogButtonBox
-from PyQt4 import uic
-
-import apt_pkg
-import sys
-
-from .Core.utils import inhibit_sleep, allow_sleep
-from .Core.DistUpgradeFetcherCore import DistUpgradeFetcherCore
-from gettext import gettext as _
-try:
-    from urllib.request import urlopen
-    from urllib.error import HTTPError
-except ImportError:
-    from urllib2 import urlopen, HTTPError
-import os
-
-from .Core.MetaRelease import MetaReleaseCore
-import time
-import apt
-
-class DistUpgradeFetcherKDE(DistUpgradeFetcherCore):
-    """A small application run by Adept to download, verify 
-    and run the dist-upgrade tool"""
-
-    def __init__(self, useDevelopmentRelease=False, useProposed=False):
-        self.useDevelopmentRelease = useDevelopmentRelease
-        self.useProposed = useProposed
-        metaRelease = MetaReleaseCore(useDevelopmentRelease, useProposed)
-        while metaRelease.downloading:
-            time.sleep(0.2)
-        if metaRelease.new_dist is None and __name__ == "__main__":
-            sys.exit()
-        elif metaRelease.new_dist is None:
-            return
-
-        self.progressDialogue = QDialog()
-        if os.path.exists("fetch-progress.ui"):
-            self.APPDIR = QDir.currentPath()
-        else:
-            self.APPDIR = "/usr/share/update-manager"
-
-        uic.loadUi(self.APPDIR + "/fetch-progress.ui", self.progressDialogue)
-        self.progressDialogue.setWindowIcon(KIcon("system-software-update"))
-        self.progressDialogue.setWindowTitle(_("Upgrade"))
-        self.progress = KDEAcquireProgressAdapter(self.progressDialogue.installationProgress, self.progressDialogue.installingLabel, None)
-        DistUpgradeFetcherCore.__init__(self,metaRelease.new_dist,self.progress)
-
-    def error(self, summary, message):
-        KMessageBox.sorry(None, message, summary)
-
-    def runDistUpgrader(self):
-        inhibit_sleep()
-        # now run it with sudo
-        if os.getuid() != 0:
-            os.execv("/usr/bin/kdesudo",["kdesudo", self.script + " --frontend=DistUpgradeViewKDE"])
-        else:
-            os.execv(self.script,[self.script]+ ["--frontend=DistUpgradeViewKDE"] + self.run_options)
-        # we shouldn't come to this point, but if we do, undo our
-        # inhibit sleep
-        allow_sleep()
-
-    def showReleaseNotes(self):
-      # FIXME: care about i18n! (append -$lang or something)
-      self.dialogue = QDialog()
-      uic.loadUi(self.APPDIR + "/dialog_release_notes.ui", self.dialogue)
-      upgradeButton = self.dialogue.buttonBox.button(QDialogButtonBox.Ok)
-      upgradeButton.setText(_("Upgrade"))
-      upgradeButton.setIcon(KIcon("dialog-ok"))
-      cancelButton = self.dialogue.buttonBox.button(QDialogButtonBox.Cancel)
-      cancelButton.setIcon(KIcon("dialog-cancel"))
-      self.dialogue.setWindowTitle(_("Release Notes"))
-      self.dialogue.show()
-      if self.new_dist.releaseNotesURI != None:
-          uri = self._expandUri(self.new_dist.releaseNotesURI)
-          # download/display the release notes
-          # FIXME: add some progress reporting here
-          result = None
-          try:
-              release_notes = urlopen(uri)
-              notes = release_notes.read().decode("UTF-8", "replace")
-              self.dialogue.scrolled_notes.setText(notes)
-              result = self.dialogue.exec_()
-          except HTTPError:
-              primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
-                          _("Could not find the release notes")
-              secondary = _("The server may be overloaded. ")
-              KMessageBox.sorry(None, primary + "<br />" + secondary, "")
-          except IOError:
-              primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
-                          _("Could not download the release notes")
-              secondary = _("Please check your internet connection.")
-              KMessageBox.sorry(None, primary + "<br />" + secondary, "")
-          # user clicked cancel
-          if result == QDialog.Accepted:
-              self.progressDialogue.show()
-              return True
-      if __name__ == "__main__":
-          KApplication.kApplication().exit(1)
-      if self.useDevelopmentRelease or self.useProposed:
-          sys.exit()  #FIXME why does KApplication.kApplication().exit() crash but this doesn't?
-      return False
-
-class KDEAcquireProgressAdapter(apt.progress.base.AcquireProgress):
-    def __init__(self,progress,label,parent):
-        self.progress = progress
-        self.label = label
-        self.parent = parent
-
-    def start(self):
-        self.label.setText(_("Downloading additional package files..."))
-        self.progress.setValue(0)
-
-    def stop(self):
-        pass
-
-    def pulse(self, owner):
-        apt.progress.base.AcquireProgress.pulse(self, owner)
-        self.progress.setValue((self.current_bytes + self.current_items) /
-                               float(self.total_bytes + self.total_items))
-        current_item = self.current_items + 1
-        if current_item > self.total_items:
-            current_item = self.total_items
-        if self.current_cps > 0:
-            self.label.setText(_("Downloading additional package files...") + _("File %s of %s at %sB/s") % (self.current_items,self.total_items,apt_pkg.size_to_str(self.current_cps)))
-        else:
-            self.label.setText(_("Downloading additional package files...") + _("File %s of %s") % (self.current_items,self.total_items))
-        KApplication.kApplication().processEvents()
-        return True
-
-    def mediaChange(self, medium, drive):
-        msg = _("Please insert '%s' into the drive '%s'") % (medium,drive)
-        #change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-        change = KMessageBox.questionYesNo(None, _("Media Change"), _("Media Change") + "<br>" + msg, KStandardGuiItem.ok(), KStandardGuiItem.cancel())
-        if change == KMessageBox.Yes:
-            return True
-        return False
-
-if __name__ == "__main__":
-
-    appName     = "dist-upgrade-fetcher"
-    catalog     = ""
-    programName = ki18n ("Dist Upgrade Fetcher")
-    version     = "0.3.4"
-    description = ki18n ("Dist Upgrade Fetcher")
-    license     = KAboutData.License_GPL
-    copyright   = ki18n ("(c) 2008 Canonical Ltd")
-    text        = ki18n ("none")
-    homePage    = "https://launchpad.net/update-manager"
-    bugEmail    = ""
-
-    aboutData   = KAboutData (appName, catalog, programName, version, description, license, copyright, text, homePage, bugEmail)
-
-    aboutData.addAuthor(ki18n("Jonathan Riddell"), ki18n("Author"))
-
-    options = KCmdLineOptions()
-
-    KCmdLineArgs.init (sys.argv, aboutData)
-    KCmdLineArgs.addCmdLineOptions(options)
-
-    app = KApplication()
-    fetcher = DistUpgradeFetcherKDE()
-    QTimer.singleShot(10, fetcher.run)
-
-    app.exec_()

=== removed file 'UpdateManager/GtkProgress.py'
--- UpdateManager/GtkProgress.py	2012-06-15 20:24:05 +0000
+++ UpdateManager/GtkProgress.py	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-# GtkProgress.py 
-#  
-#  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
-

=== removed file 'UpdateManager/HelpViewer.py'
--- UpdateManager/HelpViewer.py	2012-05-28 11:11:59 +0000
+++ UpdateManager/HelpViewer.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# helpviewer.py
-
-import os
-import subprocess
-
-# Hardcoded list of available help viewers
-# FIXME: khelpcenter support would be nice
-#KNOWN_VIEWERS = ["/usr/bin/yelp", "/usr/bin/khelpcenter"]
-KNOWN_VIEWERS = ["/usr/bin/yelp"]
-
-class HelpViewer:
-    def __init__(self, docu):
-        self.command = []
-        self.docu = docu
-        for viewer in KNOWN_VIEWERS:
-            if os.path.exists(viewer):
-                self.command = [viewer, "ghelp:%s" % docu]
-                break
-        
-    def check(self):
-        """check if a viewer is available"""
-        if self.command == []:
-            return False
-        else:
-            return True
-
-    def run(self):
-        """open the documentation in the viewer"""
-        # avoid running the help viewer as root
-        if os.getuid() == 0 and 'SUDO_USER' in os.environ:
-            self.command = ['sudo', '-u', os.environ['SUDO_USER']] +\
-                           self.command
-        subprocess.Popen(self.command)

=== removed file 'UpdateManager/InstallProgress.py'
--- UpdateManager/InstallProgress.py	2012-06-15 20:24:05 +0000
+++ UpdateManager/InstallProgress.py	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-# InstallProgress.py
-#  
-#  Copyright (c) 2004-2012 Canonical
-#                2004 Michiel Sikkes
-#                2005 Martin Willemoes Hansen
-#                2010 Mohamed Amine IL Idrissi
-#  
-#  Author: Michiel Sikkes <[e-mail]>
-#          Michael Vogt <[e-mail]>
-#          Martin Willemoes Hansen <[e-mail]>
-#          Mohamed Amine IL Idrissi <[e-mail]>
-#          Alex Launi <[e-mail]>
-#          Michael Terry <[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
-
-import warnings
-warnings.filterwarnings("ignore", "Accessed deprecated property", DeprecationWarning)
-
-import os
-import sys
-
-from .backend import get_backend
-
-from .Core.utils import (inhibit_sleep,
-                         allow_sleep)
-
-class InstallProgress(object):
-
-  def __init__(self, app):
-    self.window_main = app
-    self.datadir = app.datadir
-    self.options = app.options
-
-    # Used for inhibiting power management
-    self.sleep_cookie = None
-    self.sleep_dev = None
-
-    # get the install backend
-    self.install_backend = get_backend(self.datadir, self.window_main)
-    self.install_backend.connect("action-done", self._on_backend_done)
-
-  def invoke_manager(self):
-    # don't display apt-listchanges, we already showed the changelog
-    os.environ["APT_LISTCHANGES_FRONTEND"]="none"
-
-    # Do not suspend during the update process
-    (self.sleep_dev, self.sleep_cookie) = inhibit_sleep()
-
-    # If the progress dialog should be closed automatically afterwards
-    #settings = Gio.Settings("com.ubuntu.update-manager")
-    #close_on_done = settings.get_boolean("autoclose-install-window")
-    close_on_done = False # FIXME: confirm with mpt whether this should still be a setting
-
-    # Get the packages which should be installed and update
-    pkgs_install = []
-    pkgs_upgrade = []
-    for pkg in self.window_main.cache:
-        if pkg.marked_install:
-            pkgs_install.append(pkg.name)
-        elif pkg.marked_upgrade:
-            pkgs_upgrade.append(pkg.name)
-    self.install_backend.commit(pkgs_install, pkgs_upgrade, close_on_done)
-
-  def _on_backend_done(self, backend, action, authorized, success):
-    # Allow suspend after synaptic is finished
-    if self.sleep_cookie:
-        allow_sleep(self.sleep_dev, self.sleep_cookie)
-        self.sleep_cookie = self.sleep_dev = None
-
-    # Either launch main dialog and continue or quit altogether
-    if success:
-      self.window_main.start_available(allow_restart=True)
-    else:
-      sys.exit(0)
-
-  def main(self):
-    self.invoke_manager()

=== removed file 'UpdateManager/MetaReleaseGObject.py'
--- UpdateManager/MetaReleaseGObject.py	2012-06-15 17:36:46 +0000
+++ UpdateManager/MetaReleaseGObject.py	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-#  Copyright (c) 2004-2007 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
-
-from gi.repository import GObject
-from .Core.MetaRelease import MetaReleaseCore
-
-class MetaRelease(MetaReleaseCore,GObject.GObject):
-
-    __gsignals__ = { 
-        'new_dist_available' : (GObject.SignalFlags.RUN_LAST,
-                                None,
-                                (GObject.TYPE_PYOBJECT,)),
-        'dist_no_longer_supported' : (GObject.SignalFlags.RUN_LAST,
-                                      None,
-                                      ()),
-        'done_downloading' : (GObject.SignalFlags.RUN_LAST,
-                              None,
-                              ())
-        }
-
-    def __init__(self, useDevelopmentRelease=False, useProposed=False):
-        GObject.GObject.__init__(self)
-        MetaReleaseCore.__init__(self, useDevelopmentRelease, useProposed)
-        # in the gtk space to test if the download already finished
-        # this is needed because gtk is not thread-safe
-        GObject.timeout_add(1000, self.check)
-
-    def check(self):
-        # check if we have a metarelease_information file
-        if self.no_longer_supported is not None:
-            self.emit("dist_no_longer_supported")
-        if self.new_dist is not None:
-            self.emit("new_dist_available", self.new_dist)
-        if self.downloading:
-            return True
-        else:
-            self.emit("done_downloading")
-            return False
-

=== removed file 'UpdateManager/ReleaseNotesViewer.py'
--- UpdateManager/ReleaseNotesViewer.py	2012-06-11 16:17:31 +0000
+++ UpdateManager/ReleaseNotesViewer.py	1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-# ReleaseNotesViewer.py
-#  
-#  Copyright (c) 2006 Sebastian Heinlein
-#  
-#  Author: Sebastian Heinlein <[e-mail]>
-#
-#  This modul provides an inheritance of the Gtk.TextView that is 
-#  aware of http URLs and allows to open them in a browser.
-#  It is based on the pygtk-demo "hypertext".
-# 
-#  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 gi.repository import Pango
-from gi.repository import Gtk, GObject, Gdk
-import os
-import subprocess
-
-def open_url(url):
-    """Open the specified URL in a browser"""
-    # Find an appropiate browser
-    if os.path.exists("/usr/bin/xdg-open"):
-        command = ["xdg-open", url]
-    elif os.path.exists("/usr/bin/exo-open"):
-        command = ["exo-open", url]
-    elif os.path.exists('/usr/bin/gnome-open'):
-        command = ['gnome-open', url]
-    else:
-        command = ['x-www-browser', url]
-    # Avoid to run the browser as user root
-    if os.getuid() == 0 and 'SUDO_USER' in os.environ:
-        command = ['sudo', '-u', os.environ['SUDO_USER']] + command
-    subprocess.Popen(command)
-
-
-class ReleaseNotesViewer(Gtk.TextView):
-    def __init__(self, notes):
-        """Init the ReleaseNotesViewer as an Inheritance of the Gtk.TextView.
-           Load the notes into the buffer and make links clickable"""
-        # init the parent
-        GObject.GObject.__init__(self)
-        # global hovering over link state
-        self.hovering = False
-        self.first = True
-        # setup the buffer and signals
-        self.set_property("editable", False)
-        self.set_cursor_visible(False)
-        self.modify_font(Pango.FontDescription("monospace"))
-        self.buffer = Gtk.TextBuffer()
-        self.set_buffer(self.buffer)
-        self.buffer.set_text(notes)
-        self.connect("button-press-event", self.button_press_event)
-        self.connect("motion-notify-event", self.motion_notify_event)
-        self.connect("visibility-notify-event", self.visibility_notify_event)
-        # search for links in the notes and make them clickable
-        self.search_links()
-
-    def tag_link(self, start, end, url):
-        """Apply the tag that marks links to the specified buffer selection"""
-        tag = self.buffer.create_tag(None, foreground="blue",
-                                     underline=Pango.Underline.SINGLE)
-        tag.url = url
-        self.buffer.apply_tag(tag , start, end)
-
-    def search_links(self):
-        """Search for http URLs in the buffer and call the tag_link method
-           for each one to tag them as links"""
-        # start at the beginning of the buffer
-        iter = self.buffer.get_iter_at_offset(0)
-        while 1:
-            # search for the next URL in the buffer
-            ret = iter.forward_search("http://", Gtk.TextSearchFlags.VISIBLE_ONLY,
-                                      None)
-            # if we reach the end break the loop
-            if not ret:
-                break
-            # get the position of the protocol prefix
-            (match_start, match_end) = ret
-            match_tmp = match_end.copy()
-            while 1:
-                # extend the selection to the complete URL
-                if match_tmp.forward_char():
-                    text =  match_end.get_text(match_tmp)
-                    if text in (" ", ")", "]", "\n", "\t"):
-                        break
-                else:
-                    break
-                match_end = match_tmp.copy()
-            # call the tagging method for the complete URL
-            url = match_start.get_text(match_end)
-            self.tag_link(match_start, match_end, url)
-            # set the starting point for the next search
-            iter = match_end
-
-    def button_press_event(self, text_view, event):
-        """callback for mouse click events"""
-        if event.button != 1:
-            return False
-
-        # try to get a selection
-        try:
-            (start, end) = self.buffer.get_selection_bounds()
-        except ValueError:
-            pass
-        else:
-            if start.get_offset() != end.get_offset():
-                return False
-
-        # get the iter at the mouse position
-        (x, y) = self.window_to_buffer_coords(Gtk.TextWindowType.WIDGET,
-                                              int(event.x), int(event.y))
-        iter = self.get_iter_at_location(x, y)
-        
-        # call open_url if an URL is assigned to the iter
-        tags = iter.get_tags()
-        for tag in tags:
-            url = getattr(tag, "url", None)
-            if url != "":
-                open_url(url)
-                break
-
-    def motion_notify_event(self, text_view, event):
-        """callback for the mouse movement event, that calls the
-           check_hovering method with the mouse postition coordiantes"""
-        x, y = text_view.window_to_buffer_coords(Gtk.TextWindowType.WIDGET,
-                                                 int(event.x), int(event.y))
-        self.check_hovering(x, y)
-        self.get_window(Gtk.TextWindowType.TEXT).get_pointer()
-        return False
-    
-    def visibility_notify_event(self, text_view, event):
-        """callback if the widgets gets visible (e.g. moves to the foreground)
-           that calls the check_hovering method with the mouse position
-           coordinates"""
-        (screen, wx, wy, mod) = text_view.get_window(Gtk.TextWindowType.TEXT).get_pointer()
-        (bx, by) = text_view.window_to_buffer_coords(
-            Gtk.TextWindowType.WIDGET, wx, wy)
-        self.check_hovering(bx, by)
-        return False
-
-    def check_hovering(self, x, y):
-        """Check if the mouse is above a tagged link and if yes show
-           a hand cursor"""
-        _hovering = False
-        # get the iter at the mouse position
-        iter = self.get_iter_at_location(x, y)
-        
-        # set _hovering if the iter has the tag "url"
-        tags = iter.get_tags()
-        for tag in tags:
-            url = getattr(tag, "url", None)
-            if url != "":
-                _hovering = True
-                break
-
-        # change the global hovering state
-        if _hovering != self.hovering or self.first == True:
-            self.first = False
-            self.hovering = _hovering
-            # Set the appropriate cursur icon
-            if self.hovering:
-                self.get_window(Gtk.TextWindowType.TEXT).\
-                        set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND2))
-            else:
-                self.get_window(Gtk.TextWindowType.TEXT).\
-                        set_cursor(Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR))
-
-if __name__ == "__main__":
-    # some simple test code
-    win = Gtk.Window()
-    rv = ReleaseNotesViewer(open("../DistUpgrade/ReleaseAnnouncement").read())
-    win.add(rv)
-    win.show_all()
-    Gtk.main()

=== removed file 'UpdateManager/ReleaseNotesViewerWebkit.py'
--- UpdateManager/ReleaseNotesViewerWebkit.py	2012-05-01 14:01:29 +0000
+++ UpdateManager/ReleaseNotesViewerWebkit.py	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-# ReleaseNotesViewer.py
-#  
-#  Copyright (c) 2011 Canonical
-#  
-#  Author: Michael Vogt <[e-mail]>
-#
-#  This modul provides an inheritance of the Gtk.TextView that is 
-#  aware of http URLs and allows to open them in a browser.
-#  It is based on the pygtk-demo "hypertext".
-# 
-#  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
-
-from gi.repository import Gtk
-from gi.repository import WebKit
-
-from .ReleaseNotesViewer import open_url
-
-class ReleaseNotesViewerWebkit(WebKit.WebView):
-    def __init__(self, notes_url):
-        super(ReleaseNotesViewerWebkit, self).__init__()
-        self.load_uri(notes_url)
-        self.connect("navigation-policy-decision-requested", self._on_navigation_policy_decision_requested)
-    def _on_navigation_policy_decision_requested(self, view, frame, request, action, policy):
-        open_url(request.get_uri())
-        policy.ignore()
-        return True
-        
-    
-if __name__ == "__main__":
-    win = Gtk.Window()
-    win.set_size_request(600, 400)
-    scroll = Gtk.ScrolledWindow()
-    rv = ReleaseNotesViewerWebkit("http://archive.ubuntu.com/ubuntu/dists/natty/main/dist-upgrader-all/0.150/ReleaseAnnouncement.html")
-    scroll.add(rv)
-    win.add(scroll)
-    win.show_all()
-    Gtk.main()
-
-

=== removed file 'UpdateManager/SimpleGtk3builderApp.py'
--- UpdateManager/SimpleGtk3builderApp.py	2011-07-15 15:32:30 +0000
+++ UpdateManager/SimpleGtk3builderApp.py	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-"""
- SimpleGladeApp.py
- Module that provides an object oriented abstraction to pygtk and libglade.
- Copyright (C) 2004 Sandino Flores Moreno
-"""
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-
-import logging
-
-from gi.repository import Gtk
-
-# based on SimpleGladeApp
-class SimpleGtkbuilderApp:
-
-    def __init__(self, path, domain):
-        self.builder = Gtk.Builder()
-        self.builder.set_translation_domain(domain)
-        self.builder.add_from_file(path)
-        self.builder.connect_signals(self)
-        for o in self.builder.get_objects():
-            if issubclass(type(o), Gtk.Buildable):
-                name = Gtk.Buildable.get_name(o)
-                setattr(self, name, o)
-            else:
-                logging.debug("WARNING: can not get name for '%s'" % o)
-
-    def run(self):
-        """
-        Starts the main loop of processing events checking for Control-C.
-
-        The default implementation checks wheter a Control-C is pressed,
-        then calls on_keyboard_interrupt().
-
-        Use this method for starting programs.
-        """
-        try:
-            Gtk.main()
-        except KeyboardInterrupt:
-            self.on_keyboard_interrupt()
-
-    def on_keyboard_interrupt(self):
-        """
-        This method is called by the default implementation of run()
-        after a program is finished by pressing Control-C.
-        """
-        pass
-

=== removed file 'UpdateManager/SimpleGtkbuilderApp.py'
--- UpdateManager/SimpleGtkbuilderApp.py	2011-07-15 15:32:30 +0000
+++ UpdateManager/SimpleGtkbuilderApp.py	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-"""
- SimpleGladeApp.py
- Module that provides an object oriented abstraction to pygtk and libglade.
- Copyright (C) 2004 Sandino Flores Moreno
-"""
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-
-import logging
-
-import gtk
-
-# based on SimpleGladeApp
-class SimpleGtkbuilderApp:
-
-    def __init__(self, path, domain):
-        self.builder = gtk.Builder()
-        self.builder.set_translation_domain(domain)
-        self.builder.add_from_file(path)
-        self.builder.connect_signals(self)
-        for o in self.builder.get_objects():
-            if issubclass(type(o), gtk.Buildable):
-                name = gtk.Buildable.get_name(o)
-                setattr(self, name, o)
-            else:
-                logging.debug("WARNING: can not get name for '%s'" % o)
-
-    def run(self):
-        """
-        Starts the main loop of processing events checking for Control-C.
-
-        The default implementation checks wheter a Control-C is pressed,
-        then calls on_keyboard_interrupt().
-
-        Use this method for starting programs.
-        """
-        try:
-            gtk.main()
-        except KeyboardInterrupt:
-            self.on_keyboard_interrupt()
-
-    def on_keyboard_interrupt(self):
-        """
-        This method is called by the default implementation of run()
-        after a program is finished by pressing Control-C.
-        """
-        pass
-

=== removed file 'UpdateManager/UnitySupport.py'
--- UpdateManager/UnitySupport.py	2012-05-30 20:47:45 +0000
+++ UpdateManager/UnitySupport.py	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-# UnitySupport.py 
-#  
-#  Copyright (c) 2011 Canonical
-#  
-#  Author: Michael Vogt <[e-mail]>
-#          Bilal Akhtar <[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
-
-import logging
-from gettext import gettext as _
-
-HAVE_UNITY_SUPPORT=False
-try:
-    from gi.repository import Dbusmenu, Unity
-    HAVE_UNITY_SUPPORT=True
-except ImportError as e:
-    logging.warn("can not import unity GI %s" % e)
-
-class IUnitySupport(object):
-    """ interface for unity support """
-    def __init__(self, parent=None): pass
-    def set_updates_count(self, num_updates): pass
-    def set_urgency(self, urgent): pass
-    def set_install_menuitem_visible(self, visible): pass
-    def set_progress(self, progress): pass
-
-class UnitySupportImpl(IUnitySupport):
-    """ implementation of unity support (if unity is available) """
-
-    def __init__(self, parent=None):
-        # create launcher and quicklist
-        um_launcher_entry = Unity.LauncherEntry.get_for_desktop_id(
-            "update-manager.desktop")
-        self._unity = um_launcher_entry
-        if parent:
-            self._add_quicklist(parent)
-
-    def _add_quicklist(self, parent):
-            quicklist = Dbusmenu.Menuitem.new()
-            # install 
-            self.install_dbusmenuitem = Dbusmenu.Menuitem.new()
-            self.install_dbusmenuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
-                                                    _("Install All Available Updates"))
-            self.install_dbusmenuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, True)
-            self.install_dbusmenuitem.connect (
-                "item-activated", parent.install_all_updates, None)
-            quicklist.child_append (self.install_dbusmenuitem)
-            # add it
-            self._unity.set_property ("quicklist", quicklist)
-    
-    def set_progress(self, progress):
-        """ set the progress [0,100] """
-        self._unity.set_property("progress", progress/100.0)
-        # hide progress when out of bounds
-        if progress < 0 or progress > 100:
-            self._unity.set_property("progress_visible", False)
-        else:
-            self._unity.set_property("progress_visible", True)
-
-    def set_updates_count(self, num_updates):
-        self._unity.set_property("count", num_updates)
-        # FIXME: setup emblem as well(?)
-        if num_updates > 0:
-            self._unity.set_property("count-visible", True)
-        else:
-            self._unity.set_property("count-visible", False)
-
-    def set_urgency(self, urgent):
-        self._unity.set_property("urgent", urgent)
-
-    def set_install_menuitem_visible(self, visible):
-        self.install_dbusmenuitem.property_set_bool(Dbusmenu.MENUITEM_PROP_VISIBLE, visible)
-
-
-# check what to export to the clients
-if HAVE_UNITY_SUPPORT:
-    UnitySupport = UnitySupportImpl
-else:
-    # we just provide the empty interface 
-    UnitySupport = IUnitySupport

=== removed file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2012-06-15 20:02:33 +0000
+++ UpdateManager/UpdateManager.py	1970-01-01 00:00:00 +0000
@@ -1,335 +0,0 @@
-# UpdateManager.py
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 2; coding: utf-8 -*-
-#  
-#  Copyright (c) 2012 Canonical
-#  
-#  Author: Michael Terry <[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
-from gi.repository import Gdk
-from gi.repository import Gio
-from gi.repository import GLib
-
-import warnings
-warnings.filterwarnings("ignore", "Accessed deprecated property", DeprecationWarning)
-
-import apt_pkg
-import os
-import sys
-from gettext import gettext as _
-
-import dbus
-import dbus.service
-from dbus.mainloop.glib import DBusGMainLoop
-DBusGMainLoop(set_as_default=True)
-
-from .UnitySupport import UnitySupport
-from .Dialogs import (DistUpgradeDialog,
-                      ErrorDialog,
-                      NeedRestartDialog,
-                      NoUpdatesDialog,
-                      PartialUpgradeDialog,
-                      UnsupportedDialog)
-from .InstallProgress import InstallProgress
-from .MetaReleaseGObject import MetaRelease
-from .UpdateProgress import UpdateProgress
-from .UpdatesAvailable import UpdatesAvailable
-from .Core.AlertWatcher import AlertWatcher
-from .Core.MyCache import MyCache
-from .Core.roam import NetworkManagerHelper
-from .Core.UpdateList import UpdateList
-
-# file that signals if we need to reboot
-REBOOT_REQUIRED_FILE = "/var/run/reboot-required"
-
-class UpdateManager(Gtk.Window):
-  """ This class is the main window and work flow controller.  Panes will add
-      themselves to the main window and it will morph between them."""
-
-  def __init__(self, datadir, options):
-    Gtk.Window.__init__(self)
-
-    # Public members
-    self.datadir = datadir
-    self.options = options
-    self.unity = UnitySupport()
-    self.controller = None
-    self.cache = None
-    self.update_list = None
-    self.meta_release = None
-
-    # Basic GTK+ parameters
-    self.set_title(_("Software Updater"))
-    self.set_icon_name("system-software-update")
-    self.set_resizable(False)
-    self.set_position(Gtk.WindowPosition.CENTER)
-    self.set_size_request(500,-1)
-
-    # Signals
-    self.connect("delete-event", self.close)
-
-    self._setup_dbus()
-
-    # deal with no-focus-on-map
-    if self.options and self.options.no_focus_on_map:
-        self.set_focus_on_map(False)
-        self.iconify()
-        self.stick()
-        self.set_urgency_hint(True)
-        self.unity.set_urgency(True)
-        self.initial_focus_id = self.connect(
-            "focus-in-event", self.on_initial_focus_in)
-
-    # Look for a new release in a thread
-    self.meta_release = MetaRelease(self.options and self.options.devel_release,
-                                    self.options and self.options.use_proposed)
-
-
-  def on_initial_focus_in(self, widget, event):
-      """callback run on initial focus-in (if started unmapped)"""
-      self.unstick()
-      self.set_urgency_hint(False)
-      self.unity.set_urgency(False)
-      self.disconnect(self.initial_focus_id)
-      return False
-
-  def push(self, pane, controller):
-    child = self.get_child()
-    if child is not None:
-      if self.controller and hasattr(self.controller, "save_state"):
-        self.controller.save_state()
-      child.destroy()
-