summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkurono <andres.gomez@cern.ch>2013-12-19 23:32:19 +0100
committerTails developers <tails@boum.org>2013-12-21 10:00:33 +0000
commit65b1d8ba94f5c301d7fb17f1050f7ac47946c11a (patch)
tree1775a35199dc98d81b52ad66958720abcd68aa3c
parentb2b02903c0a3029ea6ab3871329d7c8b0a7a6d39 (diff)
Tails Installer sometimes installs files without confirmation
-rwxr-xr-xliveusb/gui.py51
1 files changed, 25 insertions, 26 deletions
diff --git a/liveusb/gui.py b/liveusb/gui.py
index 3c188c5..1fd366f 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -716,33 +716,32 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface):
# let's go on
self.confirmed = False
else:
- if self.live.existing_liveos():
- msg = (_("You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s device (%(device)s). "
- "Any persistent volume on this device will remain unchanged. "
- "Continue?") % {
- 'vendor': self.live.drive['vendor'],
- 'model': self.live.drive['model'],
- 'device': self.live.drive['device'],
- 'parent_size': _format_bytes_in_gb(self.live.drive['parent_size'])
- }
- )
- if self.live.existing_overlay() and self.overlaySlider.value():
- msg = msg + _("Warning: Creating a new persistent overlay "
- "will delete your existing one.")
- if self.show_confirmation_dialog(_("Please confirm your device selection"), msg):
- # The user has confirmed that they wish to overwrite their
- # existing Live OS. Here we delete it first, in order to
- # accurately calculate progress.
- self.delete_existing_liveos_confirmed = False
- try:
- self.live.delete_liveos()
- except LiveUSBError, e:
- self.status(e.args[0])
- #self.live.unmount_device()
- self.enable_widgets(True)
- return
- else:
+ msg = (_("You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s device (%(device)s). "
+ "Any persistent volume on this device will remain unchanged. "
+ "Continue?") % {
+ 'vendor': self.live.drive['vendor'],
+ 'model': self.live.drive['model'],
+ 'device': self.live.drive['device'],
+ 'parent_size': _format_bytes_in_gb(self.live.drive['parent_size'])
+ }
+ )
+ if self.live.existing_overlay() and self.overlaySlider.value():
+ msg = msg + _("Warning: Creating a new persistent overlay "
+ "will delete your existing one.")
+ if self.show_confirmation_dialog(_("Please confirm your device selection"), msg):
+ # The user has confirmed that they wish to overwrite their
+ # existing Live OS. Here we delete it first, in order to
+ # accurately calculate progress.
+ self.delete_existing_liveos_confirmed = False
+ try:
+ self.live.delete_liveos()
+ except LiveUSBError, e:
+ self.status(e.args[0])
+ #self.live.unmount_device()
+ self.enable_widgets(True)
return
+ else:
+ return
# Remove the log handler, because our live thread will register its own
self.live.log.removeHandler(self.handler)