← Back to branch summary

~dylanmccall/update-manager/bug-1195573

« back to all changes in this revision

Viewing changes to UpdateManager/Dialogs.py

  • Committer: Michael Terry
  • Date: 2012-06-28 20:59:30 UTC
  • mfrom: (2515.1.1 no-gksu)
  • Revision ID: michael.terry@canonical.com-20120628205930-nwmkss7yl7hodrmz
merge pkexec branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
UpdateManager/Dialogs.py
36
36
import sys
37
37
import time
38
38
from .SimpleGtk3builderApp import SimpleGtkbuilderApp
39
 
from DistUpgrade.DistUpgradeFetcher import DistUpgradeFetcherGtk
40
 
from .GtkProgress import GtkAcquireProgress
41
39
 
42
40
from gettext import gettext as _
43
41
 
130
128
        self.focus_button = self.add_button(Gtk.STOCK_OK, self.close)
131
129
 
132
130
    def upgrade(self):
133
 
        progress = GtkAcquireProgress(
134
 
            self.window_main,
135
 
            self.window_main.datadir,
136
 
            _("Downloading the release upgrade tool"))
137
 
        fetcher = DistUpgradeFetcherGtk(
138
 
            new_dist=self.meta_release.upgradable_to,
139
 
            parent=self.window_main,
140
 
            progress=progress,
141
 
            datadir=self.window_main.datadir)
142
 
        if self.window_main.options.sandbox:
143
 
            fetcher.run_options.append("--sandbox")
144
 
        fetcher.run()
 
131
        os.execl("/usr/bin/pkexec",
 
132
                 "/usr/bin/pkexec", "/usr/bin/do-release-upgrade",
 
133
                 "--frontend=DistUpgradeViewGtk3")
145
134
 
146
135
 
147
136
class UnsupportedDialog(DistUpgradeDialog):
179
168
        self.focus_button = self.add_button(_("_Continue"), Gtk.main_quit)
180
169
 
181
170
    def upgrade(self):
182
 
        os.execl("/usr/bin/gksu",
183
 
                 "/usr/bin/gksu", "--desktop",
184
 
                 "/usr/share/applications/update-manager.desktop",
185
 
                 "--", "/usr/bin/update-manager", "--dist-upgrade")
 
171
        os.execl("/usr/bin/pkexec",
 
172
                 "/usr/bin/pkexec",
 
173
                 "/usr/lib/ubuntu-release-upgrader/do-partial-upgrade",
 
174
                 "--frontend=DistUpgradeViewGtk3")
186
175
 
187
176
    def main(self):
188
177
        Dialog.main(self)