← Back to branch summary

~rbalint/update-manager/remove-autoremovable-kernels

« back to all changes in this revision

Viewing changes to UpdateManager/Dialogs.py

  • Committer: Balint Reczey
  • Date: 2018-02-13 07:38:47 UTC
  • mfrom: (2801.1.4 update-manager)
  • Revision ID: balint.reczey@canonical.com-20180213073847-bp2u1atue37ml9sg
Merge lp:~rbalint/update-manager/do-release-upgrade-without-pkexec

Show diffs side-by-side

added added

removed removed

Lines of Context:
UpdateManager/Dialogs.py
237
237
                extra_args = extra_args + " -d"
238
238
            if self.window_main.options.use_proposed:
239
239
                extra_args = extra_args + " -p"
240
 
        # Workaround restricted root access to graphical applications under
241
 
        # wayland
242
 
        if 'WAYLAND_DISPLAY' in os.environ:
243
 
            subprocess.run(["xhost", "+si:localuser:root"])
244
240
        os.execl("/bin/sh", "/bin/sh", "-c",
245
 
                 "/usr/bin/pkexec /usr/bin/do-release-upgrade "
 
241
                 "/usr/bin/do-release-upgrade "
246
242
                 "--frontend=DistUpgradeViewGtk3%s" % extra_args)
247
243
 
248
244
 
301
297
 
302
298
    def upgrade(self):
303
299
        os.execl("/bin/sh", "/bin/sh", "-c",
304
 
                 "/usr/bin/pkexec "
305
300
                 "/usr/lib/ubuntu-release-upgrader/do-partial-upgrade "
306
301
                 "--frontend=DistUpgradeViewGtk3")
307
302