From: "Brian C. Lane" bcl@redhat.com
--- pyanaconda/ui/gui/spokes/custom.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index a8ac173..88e89b7 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -847,13 +847,18 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
return None
- def _do_refresh(self, mountpointToShow=None): - # block mountpoint selector signal handler for now - self._initialized = False + def _clear_current_selector(self): + """ If something is selected, deselect it + """ if self._current_selector: self._current_selector.set_chosen(False) self._current_selector = None
+ def _do_refresh(self, mountpointToShow=None): + # block mountpoint selector signal handler for now + self._initialized = False + self._clear_current_selector() + # Make sure we start with a clean slate. self._accordion.removeAllPages()
@@ -2052,7 +2057,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
log.debug("show first mountpoint: %s" % page.pageTitle) if not page.members: - self._current_selector = None + self._clear_current_selector() return
if not mountpoint: @@ -2321,7 +2326,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): if nb_page == NOTEBOOK_DETAILS_PAGE: self._save_right_side(self._current_selector)
- self._current_selector.set_chosen(False) + self._clear_current_selector()
def on_selector_clicked(self, selector): if not self._initialized: @@ -2397,7 +2402,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): log.debug("page clicked: %s" % page.pageTitle) if self._current_selector: self._save_current_selector() - self._current_selector = None
self._show_mountpoint(page=page, mountpoint=mountpointToShow)
@@ -2748,7 +2752,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
self._devices = self.__storage.devices self._unused_devices = None # why do we cache this? - self._current_selector = None + self._clear_current_selector() self._do_refresh()
def on_value_changed(self, *args):
From: "Brian C. Lane" bcl@redhat.com
It was not populating the BTRFS entry for _device_name_dict so that if you added a /home and switched from LVM to BTRFS it would change the name to 'root' from 'home' and then reset itself because there wasn't enough room.
Related: rhbz#959707 --- 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 88e89b7..0f270b3 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -1776,7 +1776,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): if _type == device_type: self._device_name_dict[_type] = device_name continue - elif _type not in (DEVICE_TYPE_LVM, DEVICE_TYPE_MD): + elif _type not in (DEVICE_TYPE_LVM, DEVICE_TYPE_MD, DEVICE_TYPE_BTRFS): continue
swap = (device.format.type == "swap")
On Fri, 2013-05-10 at 12:11 -0700, Brian C. Lane wrote:
From: "Brian C. Lane" bcl@redhat.com
pyanaconda/ui/gui/spokes/custom.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index a8ac173..88e89b7 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -847,13 +847,18 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
return None
- def _do_refresh(self, mountpointToShow=None):
# block mountpoint selector signal handler for now
self._initialized = False
def _clear_current_selector(self):
""" If something is selected, deselect it
""" if self._current_selector: self._current_selector.set_chosen(False) self._current_selector = None
def _do_refresh(self, mountpointToShow=None):
# block mountpoint selector signal handler for now
self._initialized = False
self._clear_current_selector()
# Make sure we start with a clean slate. self._accordion.removeAllPages()
@@ -2052,7 +2057,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
log.debug("show first mountpoint: %s" % page.pageTitle) if not page.members:
self._current_selector = None
self._clear_current_selector() return if not mountpoint:
@@ -2321,7 +2326,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): if nb_page == NOTEBOOK_DETAILS_PAGE: self._save_right_side(self._current_selector)
self._current_selector.set_chosen(False)
self._clear_current_selector()
def on_selector_clicked(self, selector): if not self._initialized:
@@ -2397,7 +2402,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): log.debug("page clicked: %s" % page.pageTitle) if self._current_selector: self._save_current_selector()
self._current_selector = None self._show_mountpoint(page=page, mountpoint=mountpointToShow)
@@ -2748,7 +2752,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
self._devices = self.__storage.devices self._unused_devices = None # why do we cache this?
self._current_selector = None
self._clear_current_selector() self._do_refresh()
def on_value_changed(self, *args):
ACK to both of these.
anaconda-patches@lists.fedorahosted.org