Merge lp:~marcustomlinson/update-manager/update-manager into lp:update-manager

Proposed by Marcus Tomlinson on 2020-04-07
Status: Merged
Merged at revision: 2874
Proposed branch: lp:~marcustomlinson/update-manager/update-manager
Merge into: lp:update-manager
Diff against target: 83 lines (+11/-8)
3 files modified
UpdateManager/Dialogs.py (+1/-1)
UpdateManager/backend/__init__.py (+4/-7)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~marcustomlinson/update-manager/update-manager
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2020-04-07 Pending
Review via email: mp+381817@code.launchpad.net

Commit message

Fix pycodestyle and pyflakes autopkgtests.

To post a comment you must log in.
2874. By Iain Lane on 2020-04-07

merge lp:~marcustomlinson/update-manager/update-manager

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UpdateManager/Dialogs.py'
2--- UpdateManager/Dialogs.py 2020-04-02 00:18:15 +0000
3+++ UpdateManager/Dialogs.py 2020-04-07 12:01:33 +0000
4@@ -306,7 +306,7 @@
5 "2023-04-26.\n\nIf you reinstall Ubuntu from "
6 "ubuntu.com/download, future upgrades will "
7 "be available.") %
8- (arch, meta_release.current_dist_version))
9+ (arch, meta_release.current_dist_version))
10 self.focus_button = self.add_button(Gtk.STOCK_OK,
11 self.window_main.close)
12
13
14=== modified file 'UpdateManager/backend/__init__.py'
15--- UpdateManager/backend/__init__.py 2020-04-06 11:40:13 +0000
16+++ UpdateManager/backend/__init__.py 2020-04-07 12:01:33 +0000
17@@ -16,7 +16,7 @@
18 import os
19 import re
20 import subprocess
21-from subprocess import PIPE, Popen
22+from gettext import gettext as _
23 from threading import Thread
24
25 from UpdateManager.Core.MyCache import MyCache
26@@ -147,7 +147,7 @@
27 snap_object['channel'] = to_channel
28 snap_list[snap] = snap_object
29
30- for snap, (_) in unseeded_snaps.items():
31+ for snap, (from_channel) in unseeded_snaps.items():
32 snap_object = {}
33 # check if the snap is already installed
34 snap_info = subprocess.Popen(["snap", "info", snap],
35@@ -156,8 +156,8 @@
36 if re.search("^installed: ", snap_info[0], re.MULTILINE):
37 logging.debug("Snap %s is installed" % snap)
38 # its not tracking the release channel so don't remove
39- from_channel = "stable/ubuntu-[0-9][0-9].[0-9][0-9]"
40- if not re.search(r"^tracking:.*%s" % from_channel,
41+ re_channel = "stable/ubuntu-[0-9][0-9].[0-9][0-9]"
42+ if not re.search(r"^tracking:.*%s" % re_channel,
43 snap_info[0], re.MULTILINE):
44 logging.debug("Snap %s is not tracking the release channel"
45 % snap)
46@@ -276,7 +276,6 @@
47 try:
48 from .InstallBackendAptdaemon import InstallBackendAptdaemon
49 except ImportError:
50- import logging
51 logging.exception("importing aptdaemon")
52 # try synaptic
53 if os.path.exists("/usr/sbin/synaptic") \
54@@ -284,7 +283,6 @@
55 try:
56 from .InstallBackendSynaptic import InstallBackendSynaptic
57 except ImportError:
58- import logging
59 logging.exception("importing synaptic")
60
61
62@@ -297,7 +295,6 @@
63 try:
64 return InstallBackendAptdaemon(*args, **kwargs)
65 except NameError:
66- import logging
67 logging.exception("using aptdaemon failed")
68 # try synaptic
69 if (os.path.exists("/usr/sbin/synaptic")
70
71=== modified file 'debian/changelog'
72--- debian/changelog 2020-04-06 22:59:05 +0000
73+++ debian/changelog 2020-04-07 12:01:33 +0000
74@@ -1,3 +1,9 @@
75+update-manager (1:20.04.4) UNRELEASED; urgency=medium
76+
77+ * Fix pycodestyle and pyflakes autopkgtests.
78+
79+ -- Marcus Tomlinson <marcus.tomlinson@canonical.com> Tue, 07 Apr 2020 10:04:05 +0100
80+
81 update-manager (1:20.04.3) focal; urgency=medium
82
83 [ Gunnar Hjalmarsson ]

Subscribers

People subscribed via source and target branches

to status/vote changes: