[PATCH 1/4] Put the bad VG name into the error message (#884359).

[Chris Lumens]

---
 pyanaconda/ui/gui/spokes/custom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index c87d039..702f118 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -2050,7 +2050,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         log.debug("new VG name: %s" % name)
         if name != vg_name and name in self.__storage.names:
             self._error = _("Volume Group name %s is already in use. Not "
-                            "saving changes.")
+                            "saving changes.") % name
             self.set_info(self._error)
             self.window.show_all()
             return

[PATCH 2/4] Add/remove the HDISO source from protectedDevSpecs (#882147).

[Chris Lumens]

Should storage ever get reset (which it can in the case of moving back to
the hub from reclaim, resulting in an error), any protected attributes will
be wiped.  protectedDevSpecs is the definitive source for what's protected
and what's not.

The dev.protected lines are still there in case we do not hit an error.
---
 pyanaconda/ui/gui/spokes/source.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index fc1aacc..9892fff 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -468,6 +468,7 @@ class SourceSpoke(NormalSpoke):

# Make sure anaconda doesn't touch this device.
             part.protected = True
+            self.storage.config.protectedDevSpecs.append(part.name)
         elif self._mirror_active():
             # this preserves the url for later editing
             self.data.method.method = None
@@ -529,6 +530,9 @@ class SourceSpoke(NormalSpoke):
         # If the user moved from an HDISO method to some other, we need to
         # clear the protected bit on that device.
         if old_source.method == "harddrive" and old_source.partition:
+            if old_source.partition in self.storage.config.protectedDevSpecs:
+                self.storage.config.protectedDevSpecs.remove(old_source.partition)
+
             dev = self.storage.devicetree.getDeviceByName(old_source.partition)
             if dev:
                 dev.protected = False

[PATCH 3/4] If path doesn't exist, don't traceback. Return None.

[Chris Lumens]

---
 pyanaconda/image.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/image.py b/pyanaconda/image.py
index 6f8cc5f..f18057e 100644
--- a/pyanaconda/image.py
+++ b/pyanaconda/image.py
@@ -38,7 +38,11 @@ def findFirstIsoImage(path):

Returns the basename of the image
     """
-    flush = os.stat(path)
+    try:
+        flush = os.stat(path)
+    except OSError:
+        return None
+
     arch = _arch

if os.path.isfile(path) and path.endswith(".iso"):

[PATCH 4/4] Do not allow deleting or editing a protected device in custom part (#884599).

[Chris Lumens]

---
 pyanaconda/ui/gui/spokes/custom.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 702f118..d819dc9 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -495,6 +495,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         self._removeButton = self.builder.get_object("removeButton")
         self._configButton = self.builder.get_object("configureButton")

+        self._reformatCheckbox = self.builder.get_object("reformatCheckbox")
+
     def initialize(self):
         NormalSpoke.initialize(self)

@@ -914,7 +916,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         device_type = self._get_current_device_type()
         log.debug("new device type: %s" % device_type)

-        reformat = self.builder.get_object("reformatCheckbox").get_active()
+        reformat = self._reformatCheckbox.get_active()
         log.debug("reformat: %s" % reformat)

fs_type_combo = self.builder.get_object("fileSystemTypeCombo")
@@ -1483,7 +1485,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
     def _populate_right_side(self, selector):
         log.debug("populate_right_side: %s" % selector._device)
         encryptCheckbox = self.builder.get_object("encryptCheckbox")
-        reformatCheckbox = self.builder.get_object("reformatCheckbox")
         labelEntry = self.builder.get_object("labelEntry")
         mountPointEntry = self.builder.get_object("mountPointEntry")
         nameEntry = self.builder.get_object("nameEntry")
@@ -1552,12 +1553,13 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         else:
             sizeSpinner.set_tooltip_text(_("This file system may not be resized."))

-        reformatCheckbox.set_active(not device.format.exists)
-        reformatCheckbox.set_sensitive(use_dev.exists and
-                                       not use_dev.type.startswith("btrfs"))
+        self._reformatCheckbox.set_active(not device.format.exists)
+        self._reformatCheckbox.set_sensitive(not device.protected and
+                                             use_dev.exists and
+                                             not use_dev.type.startswith("btrfs"))

encryptCheckbox.set_active(device.encrypted)
-        encryptCheckbox.set_sensitive(reformatCheckbox.get_active())
+        encryptCheckbox.set_sensitive(self._reformatCheckbox.get_active())
         ancestors = use_dev.ancestors
         ancestors.remove(use_dev)
         if any([a.format.type == "luks" and a.format.exists for a in ancestors]):
@@ -1595,7 +1597,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
            device.originalFormat.type not in self._fs_types:
             fsCombo.append_text(device.originalFormat.name)

-        fsCombo.set_sensitive(reformatCheckbox.get_active())
+        fsCombo.set_sensitive(self._reformatCheckbox.get_sensitive() and
+                              self._reformatCheckbox.get_active())

##
         ## Set up the device type combo.
@@ -2154,8 +2157,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         selector.set_chosen(True)
         self._current_selector = selector

-        self._configButton.set_sensitive(True)
-        self._removeButton.set_sensitive(True)
+        self._configButton.set_sensitive(not selector._device.protected)
+        self._removeButton.set_sensitive(not selector._device.protected)
         return True

def on_page_clicked(self, page):
@@ -2272,9 +2275,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         fmt = getFormat(new_type)
         mountPointEntry = self.builder.get_object("mountPointEntry")
         labelEntry = self.builder.get_object("labelEntry")
-        reformat_checkbox = self.builder.get_object("reformatCheckbox")
         # FIXME: can't set a label on an existing format as of now
-        labelEntry.set_sensitive(reformat_checkbox.get_active() and
+        labelEntry.set_sensitive(self._reformatCheckbox.get_active() and
                                  hasattr(fmt, "label"))
         mountPointEntry.set_sensitive(fmt.mountable)

@@ -2406,7 +2408,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             active_index = len(fsCombo.get_model()) - 1

fsCombo.set_active(active_index)
-        fsCombo.set_sensitive(fs_type_sensitive)
+        fsCombo.set_sensitive(self._reformatCheckbox.get_sensitive() and
+                              fs_type_sensitive)
         # end btrfs magic

def clear_errors(self):

[Brian C. Lane]

ACK to all of these