Merge lp:~mterry/ubuntu-release-upgrader/u-m-symlinks into lp:ubuntu-release-upgrader

[Michael Terry]

This branch adds back some symlinks necessary to make the dist upgrade tarball more self sufficient.

What's the best test reproduction steps to help make sure this fixes all issues?

[Michael Vogt (mvo)]

This looks good, a good way for testing is using the auto-upgrade-tester, but it would have to grow a feature to test-upgrade from a bzr branch.

review: Approve

=== modified file 'DistUpgrade/DistUpgradeCache.py'
--- DistUpgrade/DistUpgradeCache.py	2012-06-27 16:20:05 +0000
+++ DistUpgrade/DistUpgradeCache.py	2012-07-03 16:54:27 +0000
@@ -40,7 +40,7 @@
 from .DistUpgradeGettext import gettext as _
 from .DistUpgradeGettext import ngettext
 
-from UpdateManager.Core.utils import inside_chroot, estimate_kernel_size_in_boot
+from .utils import inside_chroot, estimate_kernel_size_in_boot
 
 class CacheException(Exception):
     pass
 
=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2012-06-28 17:58:02 +0000
+++ DistUpgrade/DistUpgradeController.py	2012-07-03 16:54:27 +0000
@@ -45,14 +45,14 @@
 except ImportError:
     # < 3.0
     from ConfigParser import SafeConfigParser, NoOptionError
-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 .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
@@ -305,7 +305,7 @@
             and we have network - we will then try to fetch a update
             of ourself
         """  
-        from UpdateManager.Core.MetaRelease import MetaReleaseCore
+        from .MetaRelease import MetaReleaseCore
         from .DistUpgradeFetcherSelf import DistUpgradeFetcherSelf
         # check if we run from a LTS 
         forceLTS=False
 
=== modified file 'DistUpgrade/DistUpgradeFetcher.py'
--- DistUpgrade/DistUpgradeFetcher.py	2012-06-28 17:28:17 +0000
+++ DistUpgrade/DistUpgradeFetcher.py	2012-07-03 16:54:27 +0000
@@ -25,7 +25,7 @@
 from gi.repository import Gtk, Gdk
 
 from .ReleaseNotesViewer import ReleaseNotesViewer
-from UpdateManager.Core.utils import error, inhibit_sleep, allow_sleep
+from .utils import error, inhibit_sleep, allow_sleep
 from .DistUpgradeFetcherCore import DistUpgradeFetcherCore
 from .SimpleGtk3builderApp import SimpleGtkbuilderApp
 from gettext import gettext as _
 
=== modified file 'DistUpgrade/DistUpgradeFetcherCore.py'
--- DistUpgrade/DistUpgradeFetcherCore.py	2012-06-28 16:12:09 +0000
+++ DistUpgrade/DistUpgradeFetcherCore.py	2012-07-03 16:54:27 +0000
@@ -34,7 +34,7 @@
 from gettext import gettext as _
 from aptsources.sourceslist import SourcesList
 
-from UpdateManager.Core.utils import get_dist, url_downloadable, country_mirror
+from .utils import get_dist, url_downloadable, country_mirror
 
 
 class DistUpgradeFetcherCore(object):
 
=== modified file 'DistUpgrade/DistUpgradeFetcherKDE.py'
--- DistUpgrade/DistUpgradeFetcherKDE.py	2012-06-28 16:12:09 +0000
+++ DistUpgrade/DistUpgradeFetcherKDE.py	2012-07-03 16:54:27 +0000
@@ -29,7 +29,7 @@
 import apt_pkg
 import sys
 
-from UpdateManager.Core.utils import inhibit_sleep, allow_sleep
+from .utils import inhibit_sleep, allow_sleep
 from .DistUpgradeFetcherCore import DistUpgradeFetcherCore
 from gettext import gettext as _
 try:
@@ -39,7 +39,7 @@
     from urllib2 import urlopen, HTTPError
 import os
 
-from UpdateManager.Core.MetaRelease import MetaReleaseCore
+from .MetaRelease import MetaReleaseCore
 import time
 import apt
 
 
=== modified file 'DistUpgrade/DistUpgradeQuirks.py'
--- DistUpgrade/DistUpgradeQuirks.py	2012-06-27 16:20:05 +0000
+++ DistUpgrade/DistUpgradeQuirks.py	2012-07-03 16:54:27 +0000
@@ -34,10 +34,10 @@
 from subprocess import PIPE, Popen
 from hashlib import md5
 
-from UpdateManager.Core.utils import lsmod, get_arch
+from .utils import lsmod, get_arch
 
 from .DistUpgradeGettext import gettext as _
-from janitor.plugincore.manager import PluginManager
+from .janitor.plugincore.manager import PluginManager
 
 class DistUpgradeQuirks(object):
     """
 
=== modified file 'DistUpgrade/DistUpgradeViewText.py'
--- DistUpgrade/DistUpgradeViewText.py	2012-06-27 16:20:05 +0000
+++ DistUpgrade/DistUpgradeViewText.py	2012-07-03 16:54:27 +0000
@@ -33,7 +33,7 @@
 
 import gettext
 from .DistUpgradeGettext import gettext as _
-from UpdateManager.Core.utils import twrap
+from .utils import twrap
 
 class TextAcquireProgress(AcquireProgress, apt.progress.text.AcquireProgress):
     def __init__(self):
 
=== modified file 'DistUpgrade/GtkProgress.py'
--- DistUpgrade/GtkProgress.py	2012-06-28 17:28:17 +0000
+++ DistUpgrade/GtkProgress.py	2012-07-03 16:54:27 +0000
@@ -25,7 +25,7 @@
 from gi.repository import Gtk, Gdk
 import apt
 from gettext import gettext as _
-from UpdateManager.Core.utils import humanize_size
+from .utils import humanize_size
 from .SimpleGtk3builderApp import SimpleGtkbuilderApp
 
 
 
=== added symlink 'DistUpgrade/MetaRelease.py'
=== target is u'/usr/lib/python3/dist-packages/UpdateManager/Core/MetaRelease.py'
=== added symlink 'DistUpgrade/janitor'
=== target is u'/usr/lib/python3/dist-packages/janitor/'
=== added symlink 'DistUpgrade/utils.py'
=== target is u'/usr/lib/python3/dist-packages/UpdateManager/Core/utils.py'