[Pkg-privacy-commits] [tails-installer] 12/34: Handle better switching between cloning & ISO.
anonym
anonym-tails-guest at moszumanska.debian.org
Mon Jan 22 14:05:32 UTC 2018
This is an automated email from the git hooks/post-receive script.
anonym-tails-guest pushed a commit to branch tails/master
in repository tails-installer.
commit 517e41f55b27aa7b7662bf08b281d6ad5cdd19f5
Author: intrigeri <intrigeri at boum.org>
Date: Sat Jan 20 11:14:42 2018 +0000
Handle better switching between cloning & ISO.
We need to reset the live.source attribute so we can refresh the list of target
devices in function of the current source.
We need to set a default value for is_device_big_enough_for_upgrade, otherwise
a previously computed False value will remain effective in case we're in a code
path that does not change that value.
---
tails_installer/creator.py | 1 +
tails_installer/gui.py | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/tails_installer/creator.py b/tails_installer/creator.py
index dea4d20..ad32c59 100755
--- a/tails_installer/creator.py
+++ b/tails_installer/creator.py
@@ -628,6 +628,7 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
'size': block.props.size,
'mounted_partitions': set(),
'is_device_big_enough_for_installation': True,
+ 'is_device_big_enough_for_upgrade': True,
'removable': drive.props.removable,
}
diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index 83092ac..da320f3 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -420,9 +420,13 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
active_radio = [r for r in radio_button.get_group() if r.get_active()][0]
if active_radio.get_label() == "Clone the current Tails":
self.opts.clone = True
+ self.live.source = RunningLiveSystemSource(
+ path=config['running_liveos_mountpoint'])
+ self.source_available = True
self.__filechooserbutton_source_file.set_sensitive(False)
elif active_radio.get_label() == "Use a downloaded Tails ISO image":
self.opts.clone = False
+ self.live.source = None
self.__filechooserbutton_source_file.set_sensitive(True)
# previous error messages may be invalid now
self.clear_log()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git
More information about the Pkg-privacy-commits
mailing list