[PATCH 3/3] Change emphasis from subvolumes to snapshots in removal warning.

David Lehman dlehman at redhat.com
Thu Jun 5 16:48:21 UTC 2014


Snapshots can be present for lvm or btrfs, whereas subvolumes can only
be present with btrfs.
---
 pyanaconda/ui/gui/spokes/custom.py                     | 4 ++--
 pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index e7bb80a..76cc8e1 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -1797,9 +1797,9 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             # on it.  Thus, we first need to confirm with the user and then
             # schedule actions to delete the thing.
             dialog = ConfirmDeleteDialog(self.data)
-            subvols = (device.direct and not device.isleaf)
+            snapshots = (device.direct and not device.isleaf)
             dialog.refresh(getattr(device.format, "mountpoint", ""),
-                           device.name, root_name, subvols=subvols)
+                           device.name, root_name, snapshots=snapshots)
             with enlightbox(self.window, dialog.window):
                 rc = dialog.run()
 
diff --git a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
index ed5774d..381f8fa 100644
--- a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
+++ b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
@@ -221,7 +221,7 @@ class ConfirmDeleteDialog(GUIObject):
         self.window.destroy()
 
     # pylint: disable=arguments-differ
-    def refresh(self, mountpoint, device, rootName, subvols=False):
+    def refresh(self, mountpoint, device, rootName, snapshots=False):
         GUIObject.refresh(self)
         label = self.builder.get_object("confirmLabel")
 
@@ -238,10 +238,10 @@ class ConfirmDeleteDialog(GUIObject):
         else:
             txt = device
 
-        if not subvols:
+        if not snapshots:
             label_text = _("Are you sure you want to delete all of the data on %s?") % txt
         else:
-            label_text = _("Are you sure you want to delete all of the data on %s, including subvolumes and/or snapshots?") % txt
+            label_text = _("Are you sure you want to delete all of the data on %s, including snapshots and/or subvolumes?") % txt
 
         label.set_text(label_text)
 
-- 
1.9.0



More information about the anaconda-patches mailing list