--- anaconda | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/anaconda b/anaconda index d0dd05e..10d1abb 100755 --- a/anaconda +++ b/anaconda @@ -133,6 +133,7 @@ def set_x_resolution(runres):
def setupPythonUpdates(): from distutils.sysconfig import get_python_lib + import gi.overrides
# Temporary hack for F18 alpha to symlink updates and product directories # into tmpfs. To be removed after beta in order to directly use content @@ -166,6 +167,8 @@ def setupPythonUpdates(): # the updates directory. symlink_updates(dest, d)
+ gi.overrides.__path__.insert(0, "/run/install/updates") + import glob import shutil for rule in glob.glob("/tmp/updates/*.rules"):
--- 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)
--- pyanaconda/ui/gui/spokes/lib/accordion.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py index 58f3b51..adb6e4a 100644 --- a/pyanaconda/ui/gui/spokes/lib/accordion.py +++ b/pyanaconda/ui/gui/spokes/lib/accordion.py @@ -239,13 +239,17 @@ class CreateNewPage(Page):
label = Gtk.Label(_("You haven't created any mount points for your %s %s installation yet. You can:") % (productName, productVersion)) label.set_line_wrap(True) + label.set_alignment(0, 0.5) self._createBox.attach(label, 0, 0, 2, 1)
- self._createBox.attach(Gtk.Label("•"), 0, 1, 1, 1) + dot = Gtk.Label("•") + dot.set_hexpand(False) + self._createBox.attach(dot, 0, 1, 1, 1)
self._createNewButton = Gtk.LinkButton("", label=_("_Click here to create them automatically.")) label = self._createNewButton.get_children()[0] label.set_alignment(0, 0.5) + label.set_hexpand(True) label.set_line_wrap(True) label.set_use_underline(True)
@@ -255,18 +259,24 @@ class CreateNewPage(Page): self._createNewButton.connect("activate-link", lambda *args: Gtk.true()) self._createBox.attach(self._createNewButton, 1, 1, 1, 1)
- self._createBox.attach(Gtk.Label("•"), 0, 2, 1, 1) + dot = Gtk.Label("•") + dot.set_hexpand(False) + self._createBox.attach(dot, 0, 2, 1, 1)
label = Gtk.Label(_("Create new mount points by clicking the '+' button.")) label.set_alignment(0, 0.5) + label.set_hexpand(True) label.set_line_wrap(True) self._createBox.attach(label, 1, 2, 1, 1)
if partitionsToReuse: - self._createBox.attach(Gtk.Label("•"), 0, 3, 1, 1) + dot = Gtk.Label("•") + dot.set_hexpand(False) + self._createBox.attach(dot, 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_hexpand(True) label.set_line_wrap(True) self._createBox.attach(label, 1, 3, 1, 1)
ACK to all 3 of these.
anaconda-patches@lists.fedorahosted.org
-
Brian C. Lane -
Chris Lumens