[PATCH 2/3] Don't say you can reuse existing mountpoints unless there are some.
Chris Lumens
clumens at redhat.com
Thu Jan 31 18:05:58 UTC 2013
---
pyanaconda/ui/gui/spokes/custom.py | 2 +-
pyanaconda/ui/gui/spokes/lib/accordion.py | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 8012ab9..8d00108 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -700,7 +700,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
# If we've not yet run autopart, add an instance of CreateNewPage. This
# ensures it's only added once.
if not new_devices:
- page = CreateNewPage(self.on_create_clicked)
+ page = CreateNewPage(self.on_create_clicked, partitionsToReuse=bool(ui_roots))
page.pageTitle = self.translated_new_install_name
self._accordion.addPage(page, cb=self.on_page_clicked)
diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py
index af5c218..58f3b51 100644
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
@@ -227,7 +227,7 @@ class UnknownPage(Page):
# of this class will be packed into the Accordion first and then when the new installation
# is created, it will be removed and replaced with a Page for it.
class CreateNewPage(Page):
- def __init__(self, cb):
+ def __init__(self, cb, partitionsToReuse=True):
Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=6)
self.pageTitle = ""
@@ -262,11 +262,12 @@ class CreateNewPage(Page):
label.set_line_wrap(True)
self._createBox.attach(label, 1, 2, 1, 1)
- self._createBox.attach(Gtk.Label("•"), 0, 3, 1, 1)
+ if partitionsToReuse:
+ self._createBox.attach(Gtk.Label("•"), 0, 3, 1, 1)
- label = Gtk.Label(_("Or, assign new mount points to existing partitions after selecting them below."))
- label.set_alignment(0, 0.5)
- label.set_line_wrap(True)
- self._createBox.attach(label, 1, 3, 1, 1)
+ label = Gtk.Label(_("Or, assign new mount points to existing partitions after selecting them below."))
+ label.set_alignment(0, 0.5)
+ label.set_line_wrap(True)
+ self._createBox.attach(label, 1, 3, 1, 1)
self.add(self._createBox)
--
1.7.11.2
More information about the anaconda-patches
mailing list