Release Upgrader

Merge lp:~tsimonq2/ubuntu-release-upgrader/port-away-from-kdesudo into lp:ubuntu-release-upgrader

  1. port-away-from-kdesudo
  2. Merge into trunk
Proposed by Simon Quigley
Status: Merged
Merged at revision: 3111
Proposed branch: lp:~tsimonq2/ubuntu-release-upgrader/port-away-from-kdesudo
Merge into: lp:ubuntu-release-upgrader
Diff against target: 48 lines (+9/-4)
4 files modified
DistUpgrade/DistUpgradeFetcherKDE.py (+2/-2)
debian/changelog (+6/-0)
debian/control (+0/-1)
kubuntu-devel-release-upgrade (+1/-1)
To merge this branch: bzr merge lp:~tsimonq2/ubuntu-release-upgrader/port-away-from-kdesudo
Reviewer Review Type Date Requested Status
Brian Murray Approve
Rik Mills Pending
Review via email: mp+341555@code.launchpad.net

Description of the change

This ports the Qt frontend away from using kdesudo, which is a deprecated tool that should be removed from archive. This is the remaining reverse dependency that won't be removed.

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

I believe DistUpgrade/DistUpgradeFetcherKDE.py needs fixing too.

review: Needs Fixing
Revision history for this message
Simon Quigley (tsimonq2) wrote :

That's already done.

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

I must have missed that somehow. Too little coffee?

review: Approve
Revision history for this message
Simon Quigley (tsimonq2) wrote :

☕

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'DistUpgrade/DistUpgradeFetcherKDE.py'
2--- DistUpgrade/DistUpgradeFetcherKDE.py 2018-01-29 09:21:00 +0000
3+++ DistUpgrade/DistUpgradeFetcherKDE.py 2018-03-17 03:19:07 +0000
4@@ -134,8 +134,8 @@
5 def runDistUpgrader(self):
6 # now run it with sudo
7 if os.getuid() != 0:
8- os.execv("/usr/bin/kdesudo",
9- ["kdesudo",
10+ os.execv("/usr/bin/pkexec",
11+ ["pkexec",
12 self.script + " --frontend=DistUpgradeViewKDE"])
13 else:
14 os.execv(self.script,
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2018-03-16 17:56:35 +0000
18+++ debian/changelog 2018-03-17 03:19:07 +0000
19@@ -1,3 +1,9 @@
20+ubuntu-release-upgrader (1:18.04.12) bionic; urgency=medium
21+
22+ * Port away from kdesudo.
23+
24+ -- Simon Quigley <tsimonq2@ubuntu.com> Fri, 16 Mar 2018 22:15:31 -0500
25+
26 ubuntu-release-upgrader (1:18.04.11) bionic; urgency=medium
27
28 * Check that a sources.list entry for the from distribution exists
29
30=== modified file 'debian/control'
31--- debian/control 2018-02-14 22:32:56 +0000
32+++ debian/control 2018-03-17 03:19:07 +0000
33@@ -69,7 +69,6 @@
34 Depends: ${misc:Depends},
35 ubuntu-release-upgrader-core (= ${source:Version}),
36 python3-pyqt5,
37- kdesudo,
38 psmisc
39 Recommends: qttranslations5-l10n
40 Replaces: update-manager-kde (<< 1:0.165)
41
42=== modified file 'kubuntu-devel-release-upgrade'
43--- kubuntu-devel-release-upgrade 2013-04-09 11:49:00 +0000
44+++ kubuntu-devel-release-upgrade 2018-03-17 03:19:07 +0000
45@@ -1,2 +1,2 @@
46 #!/bin/sh
47-kdesudo "do-release-upgrade -m desktop -f DistUpgradeViewKDE -d"
48+pkexec do-release-upgrade -m desktop -f DistUpgradeViewKDE -d

Subscribers

People subscribed via source and target branches