Merge lp:~xnox/ubuntu-release-upgrader/lp1749199 into lp:ubuntu-release-upgrader

[Dimitri John Ledkov]

[Brian Murray (brian-murray)]

This looks fine but the PurgeObsoletes changes should also be made in DistUpgrade.cfg.xenial particularly because the bug is about an upgrade from Xenial to Bionic.

review: Needs Fixing

[lp:~xnox/ubuntu-release-upgrader/lp1749199]

3107. By Julian Andres Klode on 2018-03-15

Use HTTPS for changelogs.ubuntu.com (LP: #1744318)

3108. By Julian Andres Klode on 2018-03-15

releasing package ubuntu-release-upgrader version 1:18.04.10

3109. By Julian Andres Klode on 2018-03-16

Check that a sources.list entry for the from distribution exists
before attempting to upgrade (LP: #1725359)

3110. By Julian Andres Klode on 2018-03-16

releasing package ubuntu-release-upgrader version 1:18.04.11

3111. By Brian Murray on 2018-03-20

Merge Simon Quigley's migration from kdesudo to pkexec.

3112. By Brian Murray on 2018-03-20

change to unreleased until autopkgtests are sorted.

3113. By Brian Murray on 2018-03-21

Merge laney's change to unset a system's APT::Default-Release

3114. By Brian Murray on 2018-03-21

Increase the size of the buffer used when calculating the free space to
estimate for the initramfs.

3115. By Brian Murray on 2018-03-21

releasing package ubuntu-release-upgrader version 1:18.04.12

3116. By Launchpad Translations on behalf of ubuntu-core-dev on 2018-03-23

Launchpad automatic translations update.

3117. By Julian Andres Klode on 2018-03-29

Do not consider Suggests important, so automatically installed packages
that are not recommended or dependend on anymore are removed across a
dist upgrade (LP: #1725861)

3118. By Julian Andres Klode on 2018-03-29

releasing package ubuntu-release-upgrader version 1:18.04.13

3120. By Dimitri John Ledkov on 2018-03-30

Also set PurgeObsoletes=yes in the .xenial config

3121. By Dimitri John Ledkov on 2018-04-02

Make dist-upgrade.py work when PWD != datadir, by fixing the logic for
finding and loading .release config files with datadir prepended
first.

[Dimitri John Ledkov (xnox)]

Updated the .xenial config.
Fixed the "discovery" of .distro config overrides.
Checked that the upgrades work from:
- bzr checkout
- dist-upgrader tarball

(which moves the .distro configs into the DistUpgrade folder / flat file structure, with default datadir set as '.' the previous logic hence simply worked by ignoring datadir and using current dir which was accidentally correct things to do)

[Brian Murray (brian-murray)]

This looks good to me now, thanks!

review: Approve

[lp:~xnox/ubuntu-release-upgrader/lp1749199]

3122. By Dimitri John Ledkov on 2018-04-03

This line was intentionally left blank.

=== modified file 'DistUpgrade/DistUpgradeConfigParser.py'
--- DistUpgrade/DistUpgradeConfigParser.py	2015-01-20 22:30:06 +0000
+++ DistUpgrade/DistUpgradeConfigParser.py	2018-04-03 08:45:27 +0000
@@ -40,9 +40,9 @@
             ["lsb_release", "-c", "-s"], stdout=subprocess.PIPE,
             universal_newlines=True).communicate()[0].strip()
         self.datadir = datadir
-        if os.path.exists(name + "." + from_release):
-            name = name + "." + from_release
         maincfg = os.path.join(datadir, name)
+        if os.path.exists(maincfg + "." + from_release):
+            maincfg += "." + from_release
         # defaults are read first
         self.config_files = []
         if defaults_dir:

=== modified file 'data/DistUpgrade.cfg'
--- data/DistUpgrade.cfg	2018-02-05 11:26:33 +0000
+++ data/DistUpgrade.cfg	2018-04-03 08:45:27 +0000
@@ -23,6 +23,7 @@
 KeepInstalledPkgs=xserver-xorg-video-all
 KeepInstalledSection=translations
 RemoveObsoletes=yes
+PurgeObsoletes=yes
 #ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
 # hints for for stuff that should be done right after the cache calculated
 # the dist-upgrade (not to be confused with the PostUpgrade hooks in the

=== modified file 'data/DistUpgrade.cfg.xenial'
--- data/DistUpgrade.cfg.xenial	2017-11-06 16:22:56 +0000
+++ data/DistUpgrade.cfg.xenial	2018-04-03 08:45:27 +0000
@@ -23,6 +23,7 @@
 KeepInstalledPkgs=xserver-xorg-video-all
 KeepInstalledSection=translations
 RemoveObsoletes=yes
+PurgeObsoletes=yes
 #ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
 # hints for for stuff that should be done right after the cache calculated
 # the dist-upgrade (not to be confused with the PostUpgrade hooks in the

=== modified file 'debian/changelog'
--- debian/changelog	2018-03-29 13:30:23 +0000
+++ debian/changelog	2018-04-03 08:45:27 +0000
@@ -1,3 +1,13 @@
+ubuntu-release-upgrader (1:18.04.14) UNRELEASED; urgency=medium
+
+  * Purge obsolete packages, if user agrees to remove obsolete
+    packages. LP: #1749199
+  * Make dist-upgrade.py work when PWD != datadir, by fixing the logic for
+    finding and loading .release config files with datadir prepended
+    first.
+
+ -- Dimitri John Ledkov <[e-mail]>  Fri, 30 Mar 2018 09:32:47 +0100
+
 ubuntu-release-upgrader (1:18.04.13) bionic; urgency=medium
 
   * Do not consider Suggests important, so automatically installed packages