ubiquity

Merge lp:~rohangarg/ubiquity/ubiquity into lp:ubiquity

  1. ubiquity
  2. Merge into trunk
Proposed by Rohan Garg
Status: Merged
Merged at revision: 6172
Proposed branch: lp:~rohangarg/ubiquity/ubiquity
Merge into: lp:ubiquity
Diff against target: 20 lines (+4/-3)
1 file modified
ubiquity/plugins/ubi-language.py (+4/-3)
To merge this branch: bzr merge lp:~rohangarg/ubiquity/ubiquity
Reviewer Review Type Date Requested Status
Ubuntu Installer Team Pending
Review via email: mp+215839@code.launchpad.net
To post a comment you must log in.
lp:~rohangarg/ubiquity/ubiquity updated
6172. By Jonathan Riddell

call the appropriate
drop_privileges and regain_privileges functions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubiquity/plugins/ubi-language.py'
2--- ubiquity/plugins/ubi-language.py 2014-02-27 15:41:18 +0000
3+++ ubiquity/plugins/ubi-language.py 2014-04-15 10:40:26 +0000
4@@ -497,12 +497,13 @@
5 def openURL(self, url):
6 from PyQt4.QtGui import QDesktopServices
7 from PyQt4.QtCore import QUrl
8- from ubiquity.misc import drop_privileges_save, regain_privileges_save
9
10 # this nonsense is needed because kde doesn't want to be root
11- drop_privileges_save()
12+ misc.drop_privileges()
13+ misc.drop_privileges_save()
14 QDesktopServices.openUrl(QUrl(url))
15- regain_privileges_save()
16+ misc.regain_privileges()
17+ misc.regain_privileges_save()
18
19 def set_language_choices(self, choices, choice_map):
20 PageBase.set_language_choices(self, choices, choice_map)

Subscribers

People subscribed via source and target branches

to status/vote changes: