Release Upgrader

Merge lp:~vorlon/ubuntu-release-upgrader/lp.1825655 into lp:ubuntu-release-upgrader

  1. lp.1825655
  2. Merge into trunk
Proposed by Steve Langasek
Status: Merged
Merged at revision: 3297
Proposed branch: lp:~vorlon/ubuntu-release-upgrader/lp.1825655
Merge into: lp:ubuntu-release-upgrader
Diff against target: 1011 lines (+194/-175)
9 files modified
DistUpgrade/DistUpgradeController.py (+3/-5)
debian/changelog (+10/-0)
po/ubuntu-release-upgrader.pot (+175/-162)
setup.py (+1/-1)
tests/patchdir/pycompile_orig (+1/-1)
tests/test_apport_crash.py (+1/-1)
tests/test_end_of_life.py (+1/-1)
utils/demotions.py (+1/-1)
utils/est_kernel_size.py (+1/-3)
To merge this branch: bzr merge lp:~vorlon/ubuntu-release-upgrader/lp.1825655
Reviewer Review Type Date Requested Status
Brian Murray Approve
Steve Langasek Approve
Dmitrii Shcherbakov (community) Approve
Review via email: mp+373848@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dmitrii Shcherbakov (dmitriis) wrote :

+1

review: Approve
Revision history for this message
Steve Langasek (vorlon) :
Revision history for this message
Steve Langasek (vorlon) wrote :

Out of band approval by ~infinity.

review: Approve
Revision history for this message
Brian Murray (brian-murray) :
review: Approve
Revision history for this message
Brian Murray (brian-murray) wrote :

Should / could this be merged?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'DistUpgrade/DistUpgradeController.py'
2--- DistUpgrade/DistUpgradeController.py 2019-08-28 10:16:32 +0000
3+++ DistUpgrade/DistUpgradeController.py 2019-10-08 22:41:28 +0000
4@@ -360,13 +360,12 @@
5 fetcher.run()
6
7 def _pythonSymlinkCheck(self):
8- """ sanity check that /usr/bin/python points to the default
9+ """ sanity check that /usr/bin/python3 points to the default
10 python version. Users tend to modify this symlink, which
11 breaks stuff in obscure ways (Ubuntu #75557).
12 """
13 logging.debug("_pythonSymlinkCheck run")
14- binaries_and_dirnames = [("python", "python"), ("python2", "python"),
15- ("python3", "python3")]
16+ binaries_and_dirnames = [("python3", "python3")]
17 for binary, dirname in binaries_and_dirnames:
18 debian_defaults = '/usr/share/%s/debian_defaults' % dirname
19 if os.path.exists(debian_defaults):
20@@ -384,8 +383,7 @@
21 except OSError as e:
22 logging.error("os.readlink failed (%s)" % e)
23 return False
24- if not fs_default_version in (expected_default, os.path.join('/usr/bin', expected_default)) \
25- and not (binary == 'python' and fs_default_version in ('python2', '/usr/bin/python2')):
26+ if not fs_default_version in (expected_default, os.path.join('/usr/bin', expected_default)):
27 logging.debug("%s symlink points to: '%s', but expected is '%s' or '%s'" %
28 (binary, fs_default_version, expected_default, os.path.join('/usr/bin', expected_default)))
29 return False
30
31=== modified file 'debian/changelog'
32--- debian/changelog 2019-10-03 13:14:37 +0000
33+++ debian/changelog 2019-10-08 22:41:28 +0000
34@@ -1,3 +1,13 @@
35+ubuntu-release-upgrader (1:19.10.14) UNRELEASED; urgency=medium
36+
37+ * Don't check for validity of /usr/bin/python symlink because this is no
38+ longer relevant to the upgrades (and the printed error message was
39+ inaccurate). LP: #1825655.
40+ * Clean up remaining references to /usr/bin/python (tests and utilities)
41+ in the source.
42+
43+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 08 Oct 2019 15:19:04 -0700
44+
45 ubuntu-release-upgrader (1:19.10.13) eoan; urgency=medium
46
47 [ Brian Murray ]
48
49=== modified file 'po/ubuntu-release-upgrader.pot'
50--- po/ubuntu-release-upgrader.pot 2019-06-21 21:31:44 +0000
51+++ po/ubuntu-release-upgrader.pot 2019-10-08 22:41:28 +0000
52@@ -3,13 +3,13 @@
53 # This file is distributed under the same license as the PACKAGE package.
54 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
55 #
56-#: ../DistUpgrade/DistUpgradeController.py:1078
57+#: ../DistUpgrade/DistUpgradeController.py:1076
58 #, fuzzy
59 msgid ""
60 msgstr ""
61 "Project-Id-Version: PACKAGE VERSION\n"
62-"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
63-"POT-Creation-Date: 2019-06-21 14:30-0700\n"
64+"Report-Msgid-Bugs-To: \n"
65+"POT-Creation-Date: 2019-10-08 22:24+0000\n"
66 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
67 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
68 "Language-Team: LANGUAGE <LL@li.org>\n"
69@@ -82,15 +82,15 @@
70
71 #. FIXME: not ideal error message, but we just reuse a
72 #. existing one here to avoid a new string
73-#: ../DistUpgrade/DistUpgradeCache.py:285
74+#: ../DistUpgrade/DistUpgradeCache.py:299
75 msgid "The server may be overloaded"
76 msgstr ""
77
78-#: ../DistUpgrade/DistUpgradeCache.py:398
79+#: ../DistUpgrade/DistUpgradeCache.py:412
80 msgid "Broken packages"
81 msgstr ""
82
83-#: ../DistUpgrade/DistUpgradeCache.py:399
84+#: ../DistUpgrade/DistUpgradeCache.py:413
85 msgid ""
86 "Your system contains broken packages that couldn't be fixed with this "
87 "software. Please fix them first using synaptic or apt-get before proceeding."
88@@ -98,14 +98,14 @@
89
90 #. the most likely problem is the 3rd party pkgs so don't address
91 #. foreignPkgs and devRelease being True
92-#: ../DistUpgrade/DistUpgradeCache.py:640
93+#: ../DistUpgrade/DistUpgradeCache.py:654
94 msgid ""
95 "An unresolvable problem occurred while calculating the upgrade.\n"
96 "\n"
97 " "
98 msgstr ""
99
100-#: ../DistUpgrade/DistUpgradeCache.py:643
101+#: ../DistUpgrade/DistUpgradeCache.py:657
102 msgid ""
103 "This was likely caused by:\n"
104 " * Unofficial software packages not provided by Ubuntu\n"
105@@ -115,7 +115,7 @@
106 "\n"
107 msgstr ""
108
109-#: ../DistUpgrade/DistUpgradeCache.py:651
110+#: ../DistUpgrade/DistUpgradeCache.py:665
111 msgid ""
112 "This was caused by:\n"
113 " * Upgrading to a pre-release version of Ubuntu\n"
114@@ -123,70 +123,70 @@
115 "please try again later.\n"
116 msgstr ""
117
118-#: ../DistUpgrade/DistUpgradeCache.py:658
119+#: ../DistUpgrade/DistUpgradeCache.py:672
120 msgid "This is most likely a transient problem, please try again later."
121 msgstr ""
122
123-#: ../DistUpgrade/DistUpgradeCache.py:661
124+#: ../DistUpgrade/DistUpgradeCache.py:675
125 msgid ""
126 "If none of this applies, then please report this bug using the command "
127 "'ubuntu-bug ubuntu-release-upgrader-core' in a terminal. "
128 msgstr ""
129
130-#: ../DistUpgrade/DistUpgradeCache.py:663
131+#: ../DistUpgrade/DistUpgradeCache.py:677
132 msgid ""
133 "If you want to investigate this yourself the log files in '/var/log/dist-"
134 "upgrade' will contain details about the upgrade. Specifically, look at 'main."
135 "log' and 'apt.log'."
136 msgstr ""
137
138-#: ../DistUpgrade/DistUpgradeCache.py:669
139+#: ../DistUpgrade/DistUpgradeCache.py:683
140 msgid "Could not calculate the upgrade"
141 msgstr ""
142
143-#: ../DistUpgrade/DistUpgradeCache.py:728
144+#: ../DistUpgrade/DistUpgradeCache.py:742
145 msgid "Error authenticating some packages"
146 msgstr ""
147
148-#: ../DistUpgrade/DistUpgradeCache.py:729
149+#: ../DistUpgrade/DistUpgradeCache.py:743
150 msgid ""
151 "It was not possible to authenticate some packages. This may be a transient "
152 "network problem. You may want to try again later. See below for a list of "
153 "unauthenticated packages."
154 msgstr ""
155
156-#: ../DistUpgrade/DistUpgradeCache.py:750
157+#: ../DistUpgrade/DistUpgradeCache.py:764
158 #, python-format
159 msgid ""
160 "The package '%s' is marked for removal but it is in the removal blacklist."
161 msgstr ""
162
163-#: ../DistUpgrade/DistUpgradeCache.py:756
164+#: ../DistUpgrade/DistUpgradeCache.py:770
165 #, python-format
166 msgid "The essential package '%s' is marked for removal."
167 msgstr ""
168
169-#: ../DistUpgrade/DistUpgradeCache.py:765
170+#: ../DistUpgrade/DistUpgradeCache.py:779
171 #, python-format
172 msgid "Trying to install blacklisted version '%s'"
173 msgstr ""
174
175-#: ../DistUpgrade/DistUpgradeCache.py:884
176+#: ../DistUpgrade/DistUpgradeCache.py:898
177 #, python-format
178 msgid "Can't install '%s'"
179 msgstr ""
180
181-#: ../DistUpgrade/DistUpgradeCache.py:885
182+#: ../DistUpgrade/DistUpgradeCache.py:899
183 msgid ""
184 "It was impossible to install a required package. Please report this as a bug "
185 "using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
186 msgstr ""
187
188-#: ../DistUpgrade/DistUpgradeCache.py:896
189+#: ../DistUpgrade/DistUpgradeCache.py:910
190 msgid "Can't guess meta-package"
191 msgstr ""
192
193-#: ../DistUpgrade/DistUpgradeCache.py:897
194+#: ../DistUpgrade/DistUpgradeCache.py:911
195 #, python-format
196 msgid ""
197 "Your system does not contain a %s or %s package and it was not possible to "
198@@ -258,27 +258,27 @@
199 "'%s'"
200 msgstr ""
201
202-#: ../DistUpgrade/DistUpgradeController.py:404
203-#: ../DistUpgrade/DistUpgradeController.py:428
204+#: ../DistUpgrade/DistUpgradeController.py:402
205+#: ../DistUpgrade/DistUpgradeController.py:426
206 msgid "Can not upgrade"
207 msgstr ""
208
209-#: ../DistUpgrade/DistUpgradeController.py:405
210+#: ../DistUpgrade/DistUpgradeController.py:403
211 #, python-format
212 msgid "An upgrade from '%s' to '%s' is not supported with this tool."
213 msgstr ""
214
215-#: ../DistUpgrade/DistUpgradeController.py:429
216+#: ../DistUpgrade/DistUpgradeController.py:427
217 msgid ""
218 "Your python3 install is corrupted. Please fix the '/usr/bin/python3' symlink."
219 msgstr ""
220
221-#: ../DistUpgrade/DistUpgradeController.py:458
222+#: ../DistUpgrade/DistUpgradeController.py:456
223 #, python-format
224 msgid "Can not write to '%s'"
225 msgstr ""
226
227-#: ../DistUpgrade/DistUpgradeController.py:459
228+#: ../DistUpgrade/DistUpgradeController.py:457
229 #, python-format
230 msgid ""
231 "Its not possible to write to the system directory '%s' on your system. The "
232@@ -286,11 +286,11 @@
233 "Please make sure that the system directory is writable."
234 msgstr ""
235
236-#: ../DistUpgrade/DistUpgradeController.py:470
237+#: ../DistUpgrade/DistUpgradeController.py:468
238 msgid "Include latest updates from the Internet?"
239 msgstr ""
240
241-#: ../DistUpgrade/DistUpgradeController.py:471
242+#: ../DistUpgrade/DistUpgradeController.py:469
243 msgid ""
244 "The upgrade system can use the internet to automatically download the latest "
245 "updates and install them during the upgrade. If you have a network "
246@@ -302,21 +302,21 @@
247 "If you answer 'no' here, the network is not used at all."
248 msgstr ""
249
250-#: ../DistUpgrade/DistUpgradeController.py:649
251+#: ../DistUpgrade/DistUpgradeController.py:647
252 #, python-format
253 msgid "Not for humans during development stage of release %s"
254 msgstr ""
255
256-#: ../DistUpgrade/DistUpgradeController.py:750
257+#: ../DistUpgrade/DistUpgradeController.py:748
258 #, python-format
259 msgid "disabled on upgrade to %s"
260 msgstr ""
261
262-#: ../DistUpgrade/DistUpgradeController.py:807
263+#: ../DistUpgrade/DistUpgradeController.py:805
264 msgid "No valid sources.list entry found"
265 msgstr ""
266
267-#: ../DistUpgrade/DistUpgradeController.py:808
268+#: ../DistUpgrade/DistUpgradeController.py:806
269 #, python-format
270 msgid ""
271 "While scanning your repository information no entry about %s could be "
272@@ -327,11 +327,11 @@
273 "Do you want to continue anyway?"
274 msgstr ""
275
276-#: ../DistUpgrade/DistUpgradeController.py:820
277+#: ../DistUpgrade/DistUpgradeController.py:818
278 msgid "No valid mirror found"
279 msgstr ""
280
281-#: ../DistUpgrade/DistUpgradeController.py:821
282+#: ../DistUpgrade/DistUpgradeController.py:819
283 #, python-format
284 msgid ""
285 "While scanning your repository information no mirror entry for the upgrade "
286@@ -344,11 +344,11 @@
287 msgstr ""
288
289 #. hm, still nothing useful ...
290-#: ../DistUpgrade/DistUpgradeController.py:841
291+#: ../DistUpgrade/DistUpgradeController.py:839
292 msgid "Generate default sources?"
293 msgstr ""
294
295-#: ../DistUpgrade/DistUpgradeController.py:842
296+#: ../DistUpgrade/DistUpgradeController.py:840
297 #, python-format
298 msgid ""
299 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
300@@ -357,41 +357,41 @@
301 "will cancel."
302 msgstr ""
303
304-#: ../DistUpgrade/DistUpgradeController.py:877
305-#: ../DistUpgrade/DistUpgradeController.py:883
306+#: ../DistUpgrade/DistUpgradeController.py:875
307+#: ../DistUpgrade/DistUpgradeController.py:881
308 msgid "Repository information invalid"
309 msgstr ""
310
311-#: ../DistUpgrade/DistUpgradeController.py:878
312+#: ../DistUpgrade/DistUpgradeController.py:876
313 msgid ""
314 "Upgrading the repository information resulted in a invalid file so a bug "
315 "reporting process is being started."
316 msgstr ""
317
318-#: ../DistUpgrade/DistUpgradeController.py:884
319+#: ../DistUpgrade/DistUpgradeController.py:882
320 msgid ""
321 "Upgrading the repository information resulted in a invalid file. To report a "
322 "bug install apport and then execute 'apport-bug ubuntu-release-upgrader'."
323 msgstr ""
324
325-#: ../DistUpgrade/DistUpgradeController.py:893
326+#: ../DistUpgrade/DistUpgradeController.py:891
327 msgid "Third party sources disabled"
328 msgstr ""
329
330-#: ../DistUpgrade/DistUpgradeController.py:894
331+#: ../DistUpgrade/DistUpgradeController.py:892
332 msgid ""
333 "Some third party entries in your sources.list were disabled. You can re-"
334 "enable them after the upgrade with the 'software-properties' tool or your "
335 "package manager."
336 msgstr ""
337
338-#: ../DistUpgrade/DistUpgradeController.py:936
339+#: ../DistUpgrade/DistUpgradeController.py:934
340 msgid "Package in inconsistent state"
341 msgid_plural "Packages in inconsistent state"
342 msgstr[0] ""
343 msgstr[1] ""
344
345-#: ../DistUpgrade/DistUpgradeController.py:939
346+#: ../DistUpgrade/DistUpgradeController.py:937
347 #, python-format
348 msgid ""
349 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
350@@ -404,40 +404,40 @@
351 msgstr[0] ""
352 msgstr[1] ""
353
354-#: ../DistUpgrade/DistUpgradeController.py:1002
355+#: ../DistUpgrade/DistUpgradeController.py:1000
356 msgid "Error during update"
357 msgstr ""
358
359-#: ../DistUpgrade/DistUpgradeController.py:1003
360+#: ../DistUpgrade/DistUpgradeController.py:1001
361 msgid ""
362 "A problem occurred during the update. This is usually some sort of network "
363 "problem, please check your network connection and retry."
364 msgstr ""
365
366-#: ../DistUpgrade/DistUpgradeController.py:1046
367-#: ../DistUpgrade/DistUpgradeController.py:1051
368+#: ../DistUpgrade/DistUpgradeController.py:1044
369+#: ../DistUpgrade/DistUpgradeController.py:1049
370 msgid "EFI System Partition (ESP) not usable"
371 msgstr ""
372
373-#: ../DistUpgrade/DistUpgradeController.py:1047
374+#: ../DistUpgrade/DistUpgradeController.py:1045
375 msgid ""
376 "Your EFI System Partition (ESP) is not mounted at /boot/efi. Please ensure "
377 "that it is properly configured and try again."
378 msgstr ""
379
380-#: ../DistUpgrade/DistUpgradeController.py:1052
381+#: ../DistUpgrade/DistUpgradeController.py:1050
382 msgid ""
383 "The EFI System Partition (ESP) mounted at /boot/efi is not writable. Please "
384 "mount this partition read-write and try again."
385 msgstr ""
386
387-#: ../DistUpgrade/DistUpgradeController.py:1059
388+#: ../DistUpgrade/DistUpgradeController.py:1057
389 msgid "Not enough free disk space"
390 msgstr ""
391
392 #. TRANSLATORS: you can change the order of the sentence,
393 #. make sure to keep all {str_*} string untranslated.
394-#: ../DistUpgrade/DistUpgradeController.py:1062
395+#: ../DistUpgrade/DistUpgradeController.py:1060
396 #, python-brace-format
397 msgid ""
398 "The upgrade has aborted. The upgrade needs a total of {str_total} free space "
399@@ -446,64 +446,64 @@
400 msgstr ""
401
402 #. specific ways to resolve lack of free space
403+#: ../DistUpgrade/DistUpgradeController.py:1065
404+msgid ""
405+"Remove temporary packages of former installations using 'sudo apt clean'."
406+msgstr ""
407+
408 #: ../DistUpgrade/DistUpgradeController.py:1067
409 msgid ""
410-"Remove temporary packages of former installations using 'sudo apt clean'."
411-msgstr ""
412-
413-#: ../DistUpgrade/DistUpgradeController.py:1069
414-msgid ""
415 "You can remove old kernels using 'sudo apt autoremove' and you could also "
416 "set COMPRESS=xz in /etc/initramfs-tools/initramfs.conf to reduce the size of "
417 "your initramfs."
418 msgstr ""
419
420-#: ../DistUpgrade/DistUpgradeController.py:1074
421+#: ../DistUpgrade/DistUpgradeController.py:1072
422 msgid ""
423 "Empty your trash and remove temporary packages of former installations using "
424 "'sudo apt-get clean'."
425 msgstr ""
426
427-#: ../DistUpgrade/DistUpgradeController.py:1077
428+#: ../DistUpgrade/DistUpgradeController.py:1075
429 msgid "Reboot to clean up files in /tmp."
430 msgstr ""
431
432 #. calc the dist-upgrade and see if the removals are ok/expected
433 #. do the dist-upgrade
434-#: ../DistUpgrade/DistUpgradeController.py:1116
435-#: ../DistUpgrade/DistUpgradeController.py:1992
436-#: ../DistUpgrade/DistUpgradeController.py:2042
437+#: ../DistUpgrade/DistUpgradeController.py:1114
438+#: ../DistUpgrade/DistUpgradeController.py:1990
439+#: ../DistUpgrade/DistUpgradeController.py:2040
440 msgid "Calculating the changes"
441 msgstr ""
442
443 #. ask the user
444-#: ../DistUpgrade/DistUpgradeController.py:1160
445+#: ../DistUpgrade/DistUpgradeController.py:1158
446 msgid "Do you want to start the upgrade?"
447 msgstr ""
448
449-#: ../DistUpgrade/DistUpgradeController.py:1179
450+#: ../DistUpgrade/DistUpgradeController.py:1177
451 #, python-format
452 msgid ""
453 "Livepatch security updates are not available for Ubuntu %s. If you upgrade, "
454 "Livepatch will turn off."
455 msgstr ""
456
457-#: ../DistUpgrade/DistUpgradeController.py:1251
458+#: ../DistUpgrade/DistUpgradeController.py:1249
459 msgid "Upgrade canceled"
460 msgstr ""
461
462-#: ../DistUpgrade/DistUpgradeController.py:1252
463+#: ../DistUpgrade/DistUpgradeController.py:1250
464 msgid ""
465 "The upgrade will cancel now and the original system state will be restored. "
466 "You can resume the upgrade at a later time."
467 msgstr ""
468
469-#: ../DistUpgrade/DistUpgradeController.py:1258
470-#: ../DistUpgrade/DistUpgradeController.py:1403
471+#: ../DistUpgrade/DistUpgradeController.py:1256
472+#: ../DistUpgrade/DistUpgradeController.py:1401
473 msgid "Could not download the upgrades"
474 msgstr ""
475
476-#: ../DistUpgrade/DistUpgradeController.py:1259
477+#: ../DistUpgrade/DistUpgradeController.py:1257
478 msgid ""
479 "The upgrade has aborted. Please check your Internet connection or "
480 "installation media and try again. All files downloaded so far have been kept."
481@@ -511,33 +511,33 @@
482
483 #. FIXME: strings are not good, but we are in string freeze
484 #. currently
485+#: ../DistUpgrade/DistUpgradeController.py:1350
486+#: ../DistUpgrade/DistUpgradeController.py:1389
487+#: ../DistUpgrade/DistUpgradeController.py:1505
488+msgid "Error during commit"
489+msgstr ""
490+
491+#. generate a new cache
492 #: ../DistUpgrade/DistUpgradeController.py:1352
493 #: ../DistUpgrade/DistUpgradeController.py:1391
494-#: ../DistUpgrade/DistUpgradeController.py:1507
495-msgid "Error during commit"
496-msgstr ""
497-
498-#. generate a new cache
499-#: ../DistUpgrade/DistUpgradeController.py:1354
500-#: ../DistUpgrade/DistUpgradeController.py:1393
501-#: ../DistUpgrade/DistUpgradeController.py:1546
502+#: ../DistUpgrade/DistUpgradeController.py:1544
503 msgid "Restoring original system state"
504 msgstr ""
505
506-#: ../DistUpgrade/DistUpgradeController.py:1355
507-#: ../DistUpgrade/DistUpgradeController.py:1370
508-#: ../DistUpgrade/DistUpgradeController.py:1394
509+#: ../DistUpgrade/DistUpgradeController.py:1353
510+#: ../DistUpgrade/DistUpgradeController.py:1368
511+#: ../DistUpgrade/DistUpgradeController.py:1392
512 msgid "Could not install the upgrades"
513 msgstr ""
514
515 #. invoke the frontend now and show a error message
516-#: ../DistUpgrade/DistUpgradeController.py:1360
517+#: ../DistUpgrade/DistUpgradeController.py:1358
518 msgid ""
519 "The upgrade has aborted. Your system could be in an unusable state. A "
520 "recovery will run now (dpkg --configure -a)."
521 msgstr ""
522
523-#: ../DistUpgrade/DistUpgradeController.py:1365
524+#: ../DistUpgrade/DistUpgradeController.py:1363
525 #, python-format
526 msgid ""
527 "\n"
528@@ -548,30 +548,30 @@
529 "%s"
530 msgstr ""
531
532-#: ../DistUpgrade/DistUpgradeController.py:1404
533+#: ../DistUpgrade/DistUpgradeController.py:1402
534 msgid ""
535 "The upgrade has aborted. Please check your Internet connection or "
536 "installation media and try again. "
537 msgstr ""
538
539-#: ../DistUpgrade/DistUpgradeController.py:1432
540+#: ../DistUpgrade/DistUpgradeController.py:1430
541 msgid "Searching for obsolete software"
542 msgstr ""
543
544-#: ../DistUpgrade/DistUpgradeController.py:1495
545+#: ../DistUpgrade/DistUpgradeController.py:1493
546 msgid "Remove obsolete packages?"
547 msgstr ""
548
549-#: ../DistUpgrade/DistUpgradeController.py:1496
550+#: ../DistUpgrade/DistUpgradeController.py:1494
551 #: ../data/gtkbuilder/DistUpgrade.ui.h:8
552 msgid "_Keep"
553 msgstr ""
554
555-#: ../DistUpgrade/DistUpgradeController.py:1496
556+#: ../DistUpgrade/DistUpgradeController.py:1494
557 msgid "_Remove"
558 msgstr ""
559
560-#: ../DistUpgrade/DistUpgradeController.py:1508
561+#: ../DistUpgrade/DistUpgradeController.py:1506
562 msgid ""
563 "A problem occurred during the clean-up. Please see the below message for "
564 "more information. "
565@@ -579,45 +579,45 @@
566
567 #. FIXME: instead of error out, fetch and install it
568 #. here
569-#: ../DistUpgrade/DistUpgradeController.py:1584
570+#: ../DistUpgrade/DistUpgradeController.py:1582
571 msgid "Required depends is not installed"
572 msgstr ""
573
574-#: ../DistUpgrade/DistUpgradeController.py:1585
575+#: ../DistUpgrade/DistUpgradeController.py:1583
576 #, python-format
577 msgid "The required dependency '%s' is not installed. "
578 msgstr ""
579
580 #. sanity check (check for ubuntu-desktop, brokenCache etc)
581 #. then open the cache (again)
582-#: ../DistUpgrade/DistUpgradeController.py:1852
583-#: ../DistUpgrade/DistUpgradeController.py:1942
584+#: ../DistUpgrade/DistUpgradeController.py:1850
585+#: ../DistUpgrade/DistUpgradeController.py:1940
586 msgid "Checking package manager"
587 msgstr ""
588
589-#: ../DistUpgrade/DistUpgradeController.py:1858
590-#: ../DistUpgrade/DistUpgradeController.py:1864
591+#: ../DistUpgrade/DistUpgradeController.py:1856
592+#: ../DistUpgrade/DistUpgradeController.py:1862
593 msgid "Preparing the upgrade failed"
594 msgstr ""
595
596-#: ../DistUpgrade/DistUpgradeController.py:1859
597+#: ../DistUpgrade/DistUpgradeController.py:1857
598 msgid ""
599 "Preparing the system for the upgrade failed so a bug reporting process is "
600 "being started."
601 msgstr ""
602
603-#: ../DistUpgrade/DistUpgradeController.py:1865
604+#: ../DistUpgrade/DistUpgradeController.py:1863
605 msgid ""
606 "Preparing the system for the upgrade failed. To report a bug install apport "
607 "and then execute 'apport-bug ubuntu-release-upgrader'."
608 msgstr ""
609
610-#: ../DistUpgrade/DistUpgradeController.py:1882
611-#: ../DistUpgrade/DistUpgradeController.py:1892
612+#: ../DistUpgrade/DistUpgradeController.py:1880
613+#: ../DistUpgrade/DistUpgradeController.py:1890
614 msgid "Getting upgrade prerequisites failed"
615 msgstr ""
616
617-#: ../DistUpgrade/DistUpgradeController.py:1883
618+#: ../DistUpgrade/DistUpgradeController.py:1881
619 msgid ""
620 "The system was unable to get the prerequisites for the upgrade. The upgrade "
621 "will abort now and restore the original system state.\n"
622@@ -625,7 +625,7 @@
623 "Additionally, a bug reporting process is being started."
624 msgstr ""
625
626-#: ../DistUpgrade/DistUpgradeController.py:1893
627+#: ../DistUpgrade/DistUpgradeController.py:1891
628 msgid ""
629 "The system was unable to get the prerequisites for the upgrade. The upgrade "
630 "will abort now and restore the original system state.\n"
631@@ -634,23 +634,23 @@
632 "upgrader'."
633 msgstr ""
634
635-#: ../DistUpgrade/DistUpgradeController.py:1926
636+#: ../DistUpgrade/DistUpgradeController.py:1924
637 msgid "Updating repository information"
638 msgstr ""
639
640-#: ../DistUpgrade/DistUpgradeController.py:1933
641+#: ../DistUpgrade/DistUpgradeController.py:1931
642 msgid "Failed to add the cdrom"
643 msgstr ""
644
645-#: ../DistUpgrade/DistUpgradeController.py:1934
646+#: ../DistUpgrade/DistUpgradeController.py:1932
647 msgid "Sorry, adding the cdrom was not successful."
648 msgstr ""
649
650-#: ../DistUpgrade/DistUpgradeController.py:1969
651+#: ../DistUpgrade/DistUpgradeController.py:1967
652 msgid "Invalid package information"
653 msgstr ""
654
655-#: ../DistUpgrade/DistUpgradeController.py:1970
656+#: ../DistUpgrade/DistUpgradeController.py:1968
657 #, python-format
658 msgid ""
659 "After updating your package information, the essential package '%s' could "
660@@ -662,67 +662,67 @@
661 "later."
662 msgstr ""
663
664-#: ../DistUpgrade/DistUpgradeController.py:1999
665-#: ../DistUpgrade/DistUpgradeController.py:2098
666+#: ../DistUpgrade/DistUpgradeController.py:1997
667+#: ../DistUpgrade/DistUpgradeController.py:2096
668 msgid "Fetching"
669 msgstr ""
670
671+#: ../DistUpgrade/DistUpgradeController.py:2004
672+#: ../DistUpgrade/DistUpgradeController.py:2025
673+#: ../DistUpgrade/DistUpgradeController.py:2046
674+#: ../DistUpgrade/DistUpgradeController.py:2100
675+msgid "Upgrading"
676+msgstr ""
677+
678 #: ../DistUpgrade/DistUpgradeController.py:2006
679-#: ../DistUpgrade/DistUpgradeController.py:2027
680-#: ../DistUpgrade/DistUpgradeController.py:2048
681-#: ../DistUpgrade/DistUpgradeController.py:2102
682-msgid "Upgrading"
683-msgstr ""
684-
685-#: ../DistUpgrade/DistUpgradeController.py:2008
686 msgid "Upgrade infeasible"
687 msgstr ""
688
689-#: ../DistUpgrade/DistUpgradeController.py:2009
690+#: ../DistUpgrade/DistUpgradeController.py:2007
691 msgid ""
692 "The upgrade could not be completed, there were errors during the upgrade "
693 "process."
694 msgstr ""
695
696 #. don't abort here, because it would restore the sources.list
697-#: ../DistUpgrade/DistUpgradeController.py:2030
698+#: ../DistUpgrade/DistUpgradeController.py:2028
699 msgid "Upgrade incomplete"
700 msgstr ""
701
702-#: ../DistUpgrade/DistUpgradeController.py:2031
703+#: ../DistUpgrade/DistUpgradeController.py:2029
704 msgid ""
705 "The upgrade has partially completed but there were errors during the upgrade "
706 "process."
707 msgstr ""
708
709 #. don't abort here, because it would restore the sources.list
710-#: ../DistUpgrade/DistUpgradeController.py:2053
711-#: ../DistUpgrade/DistUpgradeController.py:2104
712-#: ../DistUpgrade/DistUpgradeController.py:2110
713-#: ../DistUpgrade/DistUpgradeController.py:2121
714+#: ../DistUpgrade/DistUpgradeController.py:2051
715+#: ../DistUpgrade/DistUpgradeController.py:2102
716+#: ../DistUpgrade/DistUpgradeController.py:2108
717+#: ../DistUpgrade/DistUpgradeController.py:2119
718 msgid "Upgrade complete"
719 msgstr ""
720
721-#: ../DistUpgrade/DistUpgradeController.py:2054
722-#: ../DistUpgrade/DistUpgradeController.py:2105
723-#: ../DistUpgrade/DistUpgradeController.py:2111
724+#: ../DistUpgrade/DistUpgradeController.py:2052
725+#: ../DistUpgrade/DistUpgradeController.py:2103
726+#: ../DistUpgrade/DistUpgradeController.py:2109
727 msgid ""
728 "The upgrade has completed but there were errors during the upgrade process."
729 msgstr ""
730
731-#: ../DistUpgrade/DistUpgradeController.py:2073
732+#: ../DistUpgrade/DistUpgradeController.py:2071
733 msgid "System upgrade is complete."
734 msgstr ""
735
736-#: ../DistUpgrade/DistUpgradeController.py:2122
737+#: ../DistUpgrade/DistUpgradeController.py:2120
738 msgid "The partial upgrade was completed."
739 msgstr ""
740
741-#: ../DistUpgrade/DistUpgradeController.py:2150
742+#: ../DistUpgrade/DistUpgradeController.py:2148
743 msgid "Lock screen disabled"
744 msgstr ""
745
746-#: ../DistUpgrade/DistUpgradeController.py:2151
747+#: ../DistUpgrade/DistUpgradeController.py:2149
748 msgid ""
749 "Your lock screen has been disabled and will remain disabled until you reboot."
750 msgstr ""
751@@ -835,7 +835,6 @@
752 msgstr ""
753
754 #: ../DistUpgrade/DistUpgradeFetcherKDE.py:154
755-#: ../DistUpgrade/DistUpgradeViewKDE.py:715
756 msgid "&Cancel"
757 msgstr ""
758
759@@ -878,11 +877,11 @@
760 msgid "Media Change"
761 msgstr ""
762
763-#: ../DistUpgrade/DistUpgradeQuirks.py:190
764+#: ../DistUpgrade/DistUpgradeQuirks.py:218
765 msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
766 msgstr ""
767
768-#: ../DistUpgrade/DistUpgradeQuirks.py:192
769+#: ../DistUpgrade/DistUpgradeQuirks.py:220
770 msgid ""
771 "Running the 'unity' desktop environment is not fully supported by your "
772 "graphics hardware. You will maybe end up in a very slow environment after "
773@@ -892,11 +891,11 @@
774 "upgrade?"
775 msgstr ""
776
777-#: ../DistUpgrade/DistUpgradeQuirks.py:216
778+#: ../DistUpgrade/DistUpgradeQuirks.py:244
779 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
780 msgstr ""
781
782-#: ../DistUpgrade/DistUpgradeQuirks.py:218
783+#: ../DistUpgrade/DistUpgradeQuirks.py:246
784 msgid ""
785 "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
786 "and you may encounter problems after the upgrade. For more information see "
787@@ -904,13 +903,13 @@
788 "continue with the upgrade?"
789 msgstr ""
790
791-#: ../DistUpgrade/DistUpgradeQuirks.py:238
792+#: ../DistUpgrade/DistUpgradeQuirks.py:266
793 msgid ""
794 "Upgrading may reduce desktop effects, and performance in games and other "
795 "graphically intensive programs."
796 msgstr ""
797
798-#: ../DistUpgrade/DistUpgradeQuirks.py:242
799+#: ../DistUpgrade/DistUpgradeQuirks.py:270
800 msgid ""
801 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
802 "of this driver is available that works with your hardware in Ubuntu 10.04 "
803@@ -919,20 +918,24 @@
804 "Do you want to continue?"
805 msgstr ""
806
807-#: ../DistUpgrade/DistUpgradeQuirks.py:277
808-msgid "apt architecture is i386"
809+#: ../DistUpgrade/DistUpgradeQuirks.py:309
810+msgid "Sorry, no more upgrades for this system"
811 msgstr ""
812
813-#: ../DistUpgrade/DistUpgradeQuirks.py:278
814+#: ../DistUpgrade/DistUpgradeQuirks.py:310
815+#, python-format
816 msgid ""
817-"Upgrades from 18.04 on the i386 architecture are not supported at this time."
818+"There will not be any further Ubuntu releases for this system's 'i386' "
819+"architecture.\n"
820+"\n"
821+"Updates for Ubuntu %s will continue until %s."
822 msgstr ""
823
824-#: ../DistUpgrade/DistUpgradeQuirks.py:292
825+#: ../DistUpgrade/DistUpgradeQuirks.py:325
826 msgid "No ARMv6 CPU"
827 msgstr ""
828
829-#: ../DistUpgrade/DistUpgradeQuirks.py:293
830+#: ../DistUpgrade/DistUpgradeQuirks.py:326
831 msgid ""
832 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
833 "packages in karmic were built with optimizations requiring ARMv6 as the "
834@@ -940,11 +943,11 @@
835 "Ubuntu release with this hardware."
836 msgstr ""
837
838-#: ../DistUpgrade/DistUpgradeQuirks.py:313
839+#: ../DistUpgrade/DistUpgradeQuirks.py:346
840 msgid "No init available"
841 msgstr ""
842
843-#: ../DistUpgrade/DistUpgradeQuirks.py:314
844+#: ../DistUpgrade/DistUpgradeQuirks.py:347
845 msgid ""
846 "Your system appears to be a virtualised environment without an init daemon, "
847 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
848@@ -954,11 +957,11 @@
849 "Are you sure you want to continue?"
850 msgstr ""
851
852-#: ../DistUpgrade/DistUpgradeQuirks.py:419
853+#: ../DistUpgrade/DistUpgradeQuirks.py:452
854 msgid "Connection to Snap Store failed"
855 msgstr ""
856
857-#: ../DistUpgrade/DistUpgradeQuirks.py:420
858+#: ../DistUpgrade/DistUpgradeQuirks.py:453
859 msgid ""
860 "Your system does not have a connection to the Snap Store. For the best "
861 "upgrade experience make sure that your system can connect to api.snapcraft."
862@@ -966,36 +969,43 @@
863 "Do you still want to continue with the upgrade?"
864 msgstr ""
865
866-#: ../DistUpgrade/DistUpgradeQuirks.py:429
867+#: ../DistUpgrade/DistUpgradeQuirks.py:462
868 msgid "Outdated snapd package"
869 msgstr ""
870
871-#: ../DistUpgrade/DistUpgradeQuirks.py:430
872+#: ../DistUpgrade/DistUpgradeQuirks.py:463
873 msgid ""
874 "Your system does not have the latest version of snapd. Please update the "
875 "version of snapd on your system to improve the upgrade experience.\n"
876 "Do you still want to continue with the upgrade?"
877 msgstr ""
878
879-#: ../DistUpgrade/DistUpgradeQuirks.py:461
880-msgid "Checking for installed snaps"
881-msgstr ""
882-
883-#: ../DistUpgrade/DistUpgradeQuirks.py:477
884+#. now perform direct API calls to the store, requesting size
885+#. information for each of the snaps needing installation
886+#: ../DistUpgrade/DistUpgradeQuirks.py:486
887+msgid "Calculating snap size requirements"
888+msgstr ""
889+
890+#. gtk-common-themes isn't a package name but is this risky?
891+#: ../DistUpgrade/DistUpgradeQuirks.py:518
892+msgid "Processing snap replacements"
893+msgstr ""
894+
895+#: ../DistUpgrade/DistUpgradeQuirks.py:525
896 #, python-format
897 msgid "refreshing snap %s"
898 msgstr ""
899
900-#: ../DistUpgrade/DistUpgradeQuirks.py:480
901+#: ../DistUpgrade/DistUpgradeQuirks.py:527
902 #, python-format
903 msgid "installing snap %s"
904 msgstr ""
905
906-#: ../DistUpgrade/DistUpgradeQuirks.py:507
907+#: ../DistUpgrade/DistUpgradeQuirks.py:554
908 msgid "PAE not enabled"
909 msgstr ""
910
911-#: ../DistUpgrade/DistUpgradeQuirks.py:508
912+#: ../DistUpgrade/DistUpgradeQuirks.py:555
913 msgid ""
914 "Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
915 "non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
916@@ -1003,6 +1013,10 @@
917 "http://help.ubuntu.com/community/EnablingPAE"
918 msgstr ""
919
920+#: ../DistUpgrade/DistUpgradeQuirks.py:833
921+msgid "Checking for installed snaps"
922+msgstr ""
923+
924 #: ../DistUpgrade/DistUpgradeMain.py:58
925 msgid "Use the given path to search for a cdrom with upgradable packages"
926 msgstr ""
927@@ -1186,11 +1200,6 @@
928 msgid "Error"
929 msgstr ""
930
931-#: ../DistUpgrade/DistUpgradeViewKDE.py:719
932-#: ../DistUpgrade/DistUpgradeViewKDE.py:960
933-msgid "&Close"
934-msgstr ""
935-
936 #: ../DistUpgrade/DistUpgradeViewKDE.py:753
937 msgid "Show Terminal >>>"
938 msgstr ""
939@@ -1254,6 +1263,10 @@
940 msgid "_Restart Now"
941 msgstr ""
942
943+#: ../DistUpgrade/DistUpgradeViewKDE.py:960
944+msgid "&Close"
945+msgstr ""
946+
947 #. FIXME make this user friendly
948 #: ../DistUpgrade/DistUpgradeViewKDE.py:977
949 msgid ""
950
951=== modified file 'setup.py'
952--- setup.py 2012-06-28 18:13:45 +0000
953+++ setup.py 2019-10-08 22:41:28 +0000
954@@ -1,4 +1,4 @@
955-#!/usr/bin/env python
956+#!/usr/bin/env python3
957
958 import glob
959
960
961=== modified file 'tests/patchdir/pycompile_orig'
962--- tests/patchdir/pycompile_orig 2012-06-06 21:15:50 +0000
963+++ tests/patchdir/pycompile_orig 2019-10-08 22:41:28 +0000
964@@ -1,4 +1,4 @@
965-#! /usr/bin/python
966+#! /usr/bin/python3
967 # -*- coding: UTF-8 -*-
968 # vim: et ts=4 sw=4
969
970
971=== modified file 'tests/test_apport_crash.py'
972--- tests/test_apport_crash.py 2015-08-13 18:23:17 +0000
973+++ tests/test_apport_crash.py 2019-10-08 22:41:28 +0000
974@@ -1,4 +1,4 @@
975-#!/usr/bin/python
976+#!/usr/bin/python3
977
978 import os
979 import sys
980
981=== modified file 'tests/test_end_of_life.py'
982--- tests/test_end_of_life.py 2016-11-29 16:36:37 +0000
983+++ tests/test_end_of_life.py 2019-10-08 22:41:28 +0000
984@@ -1,4 +1,4 @@
985-#!/usr/bin/python
986+#!/usr/bin/python3
987
988 import gi
989 gi.require_version('Gtk', '3.0')
990
991=== modified file 'utils/demotions.py'
992--- utils/demotions.py 2019-07-29 21:10:45 +0000
993+++ utils/demotions.py 2019-10-08 22:41:28 +0000
994@@ -1,4 +1,4 @@
995-#! /usr/bin/env python
996+#! /usr/bin/env python3
997 #
998 # FIXME: strip "TryExec" from the extracted menu files (and noDisplay)
999 #
1000
1001=== modified file 'utils/est_kernel_size.py'
1002--- utils/est_kernel_size.py 2012-06-11 11:26:36 +0000
1003+++ utils/est_kernel_size.py 2019-10-08 22:41:28 +0000
1004@@ -1,6 +1,4 @@
1005-#!/usr/bin/python
1006-
1007-from __future__ import print_function
1008+#!/usr/bin/python3
1009
1010 import apt_pkg
1011 import glob

Subscribers

People subscribed via source and target branches