[Pkg-privacy-commits] [tails-installer] 04/12: Give a more appropiate name to device_with_persistence. Implments Feature #14723

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to annotated tag tails-installer_5.0.2
in repository tails-installer.

commit 3b0e29fd0bd972e0241cd84278e4247ffccafa6d
Author: kurono <andres.gomez at cern.ch>
Date:   Fri Sep 29 17:53:39 2017 +0200

    Give a more appropiate name to device_with_persistence. Implments Feature #14723
---
 tails_installer/gui.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index 45a4b5c..e914df5 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -301,7 +301,7 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
         self.source_available = False
         self.target_available = False
         self.target_selected  = False
-        self.device_with_persistence = []
+        self.devices_with_persistence = []
         self.force_reinstall = False
 
         if self.opts.unprivileged == None:
@@ -528,7 +528,7 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
                 self.__infobar.set_visible(False)
             self.live.log.debug('drives: %s' % self.live.drives)
             target_list = []
-            self.device_with_persistence = []
+            self.devices_with_persistence = []
             for device, info in self.live.drives.items():
                 # Skip the device that is the source of the copy
                 if (
@@ -547,7 +547,7 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
                 # Skip LUKS-encrypted partitions
                 if info['fstype'] and info['fstype'] == 'crypto_LUKS':
                     self.live.log.debug('Skipping LUKS-encrypted partition: %s' % info['device'])
-                    self.device_with_persistence.append(info['parent'])
+                    self.devices_with_persistence.append(info['parent'])
                     continue
                 pretty_name = self.get_device_pretty_name(info)
                 # Skip devices with non-removable bit enabled
@@ -724,7 +724,7 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
                 'parent_size': _format_bytes_in_gb(self.live.drive['parent_size']),
             }
             persistence_message = ""
-            if self.device_with_persistence:
+            if self.devices_with_persistence:
                 persistence_message = _("\n\nThe persistent storage on this USB stick will be preserved.")
             msg = _("%(description)s%(persistence_message)s") % {
                 'description': description,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git