anaconda-patches December 2012

anaconda-patches@lists.fedorahosted.org

14 participants
86 discussions

[PATCH 1/2] ISOImage needs to look at /run/install/source for the mounted image (#879142).
by Chris Lumens 03 Dec '12

03 Dec '12

--- pyanaconda/constants.py | 2 +- pyanaconda/packaging/yumpayload.py | 4 ++-- pyanaconda/ui/gui/spokes/source.py | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pyanaconda/constants.py b/pyanaconda/constants.py index c4c0007..7ff5020 100644 --- a/pyanaconda/constants.py +++ b/pyanaconda/constants.py @@ -78,7 +78,7 @@ ANACONDA_CLEANUP = "anaconda-cleanup" ROOT_PATH = "/mnt/sysimage" MOUNT_DIR = "/mnt/install" DRACUT_REPODIR = "/run/install/repo" -DRACUT_ISODIR = "/run/install/isodir" +DRACUT_ISODIR = "/run/install/source" ISO_DIR = MOUNT_DIR + "/isodir" INSTALL_TREE = MOUNT_DIR + "/source" BASE_REPO_NAME = "anaconda" diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 0c5ea8c..f1de826 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -500,11 +500,11 @@ reposdir=%s if not self.data.method.method == "harddrive": return None # This could either be mounted to INSTALL_TREE or on - # DRACUT_REPODIR if dracut did the mount. + # DRACUT_ISODIR if dracut did the mount. dev = get_mount_device(INSTALL_TREE) if dev: return dev[len(ISO_DIR)+1:] - dev = get_mount_device(DRACUT_REPODIR) + dev = get_mount_device(DRACUT_ISODIR) if dev: return dev[len(DRACUT_ISODIR)+1:] return None diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index 33518b5..3e940ef 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -459,7 +459,8 @@ class SourceSpoke(NormalSpoke): self.data.method.method = "harddrive" self.data.method.partition = part.name - self.data.method.dir = self._currentIsoFile + # The / gets stripped off by payload.ISOImage + self.data.method.dir = "/" + self._currentIsoFile if (old_source.method == "harddrive" and old_source.partition == self.data.method.partition and old_source.dir == self.data.method.dir): -- 1.7.11.2

3 4

[PATCH] Do not allow manipulating protected devices in the reclaim dialog (#882147).
by Chris Lumens 03 Dec '12

03 Dec '12

Also, add a tooltip to describe why you can't do something to a given device. --- pyanaconda/ui/gui/spokes/lib/resize.glade | 3 +++ pyanaconda/ui/gui/spokes/lib/resize.py | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/lib/resize.glade b/pyanaconda/ui/gui/spokes/lib/resize.glade index 86e8ee1..f2cd461 100644 --- a/pyanaconda/ui/gui/spokes/lib/resize.glade +++ b/pyanaconda/ui/gui/spokes/lib/resize.glade @@ -17,6 +17,8 @@ <column type="gchararray"/>  <column type="gboolean"/> +  + <column type="gchararray"/> </columns> </object> <object class="GtkDialog" id="resizeDialog"> @@ -126,6 +128,7 @@ <property name="model">diskStore</property> <property name="enable_search">False</property> <property name="enable_tree_lines">True</property> + <property name="tooltip_column">7</property> <signal name="row-activated" handler="on_row_clicked" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection" id="diskView-selection"> diff --git a/pyanaconda/ui/gui/spokes/lib/resize.py b/pyanaconda/ui/gui/spokes/lib/resize.py index 0d66c76..dcc8527 100644 --- a/pyanaconda/ui/gui/spokes/lib/resize.py +++ b/pyanaconda/ui/gui/spokes/lib/resize.py @@ -41,6 +41,7 @@ RECLAIMABLE_COL = 3 PERCENT_COL = 4 ACTION_COL = 5 EDITABLE_COL = 6 +TOOLTIP_COL = 7 PRESERVE = N_("Preserve") SHRINK = N_("Shrink") @@ -118,7 +119,7 @@ class ResizeDialog(GUIObject): fstype = "" diskReclaimableSpace = 0 else: - editable = True + editable = not disk.protected percent = 100 fstype = disk.format.type diskReclaimableSpace = disk.size @@ -129,7 +130,8 @@ class ResizeDialog(GUIObject): "<span foreground='grey' style='italic'>%s total</span>", percent, _(PRESERVE), - editable]) + editable, + _("Whole disks are not editable.")]) if disk.partitioned: # Then add all its partitions. @@ -144,13 +146,19 @@ class ResizeDialog(GUIObject): else: freeSize = dev.size + if dev.protected: + tooltip = _("This device contains the installation source.") + else: + tooltip = None + self._diskStore.append(itr, [dev.id, self._description(dev), dev.format.type, _("%s of %s") % (size_str(freeSize), size_str(dev.size)), int((freeSize/dev.size) * 100), _(PRESERVE), - True]) + not dev.protected, + tooltip]) diskReclaimableSpace += freeSize # And then go back and fill in the total reclaimable space for the -- 1.7.11.2

2 1

[master] [PATCH] Do not list some layouts twice (#882526)
by Vratislav Podzimek 03 Dec '12

03 Dec '12

If some layout is related to two (or more) languages, we get it twice while iterating over languages and their related layouts. Since we use a mapping from a layout name (e.g. 'us') to decription ('English (English (US))') the result is that some items are listed twice in the list of all available layouts. This needs some further fixing, but I'm leaving this for the related post-F18 UI changes (see #859465 for more information). Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/keyboard.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py index f317398..5d4db68 100755 --- a/pyanaconda/keyboard.py +++ b/pyanaconda/keyboard.py @@ -374,10 +374,14 @@ class XklWrapper(object): name = item_str(item.name) description = item_str(item.description) - if dest: - self.name_to_show_str[name] = "%s (%s)" % (dest.encode("utf-8"), - description.encode("utf-8")) - self._variants_list.append(_Layout(name, description)) + #if this layout has already been added for some other language, + #do not add it again (would result in duplicates in our lists) + if name not in self.name_to_show_str: + if dest: + self.name_to_show_str[name] = "%s (%s)" % (dest.encode("utf-8"), + description.encode("utf-8")) + + self._variants_list.append(_Layout(name, description)) def _get_language_variants(self, c_reg, item, user_data=None): #helper "global" variable -- 1.7.11.7

2 1

[PATCH] don't write network settings on image install
by Brian C. Lane 03 Dec '12

03 Dec '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- pyanaconda/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/install.py b/pyanaconda/install.py index 14bc4a5..1282d74 100644 --- a/pyanaconda/install.py +++ b/pyanaconda/install.py @@ -68,7 +68,7 @@ def doConfiguration(storage, payload, ksdata, instClass): ksdata.firewall.execute(storage, ksdata, instClass) ksdata.xconfig.execute(storage, ksdata, instClass) - if not flags.imageInstall: + if not flags.flags.imageInstall: with progress_report(_("Writing network configuration")): writeNetworkConf(storage, ksdata, instClass) -- 1.8.0

2 2

[PATCH] Get rid of the unneeded action1.
by Chris Lumens 03 Dec '12

03 Dec '12

This is just causing assertions on tty1. --- pyanaconda/ui/gui/spokes/custom.glade | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index 70ec694..3b72856 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -2,7 +2,6 @@ <interface>   - <object class="GtkAction" id="action1"/> <object class="GtkDialog" id="addDialog"> <property name="can_focus">False</property> <property name="border_width">5</property> @@ -1441,7 +1440,6 @@ you'll be able to view their details here.</property> <child> <object class="GtkToolButton" id="addButton"> <property name="use_action_appearance">False</property> - <property name="related_action">action1</property> <property name="width_request">42</property> <property name="height_request">36</property> <property name="visible">True</property> @@ -1460,7 +1458,6 @@ you'll be able to view their details here.</property> <child> <object class="GtkToolButton" id="removeButton"> <property name="use_action_appearance">False</property> - <property name="related_action">action1</property> <property name="width_request">42</property> <property name="height_request">36</property> <property name="visible">True</property> @@ -1479,7 +1476,6 @@ you'll be able to view their details here.</property> <child> <object class="GtkToolButton" id="configureButton"> <property name="use_action_appearance">False</property> - <property name="related_action">action1</property> <property name="width_request">42</property> <property name="height_request">36</property> <property name="visible">True</property> -- 1.7.11.2

2 1

[PATCH] Correct doing string substitution for encryption.
by Chris Lumens 03 Dec '12

03 Dec '12

--- pyanaconda/ui/gui/spokes/lib/passphrase.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py index 63be728..ecf2484 100644 --- a/pyanaconda/ui/gui/spokes/lib/passphrase.py +++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py @@ -81,8 +81,8 @@ class PassphraseDialog(GUIObject): # update the warning label with the currently selected keymap xkl_wrapper = keyboard.XklWrapper.get_instance() keymap_name = xkl_wrapper.get_current_layout_name() - warning_label_text = warning_label_template % keymap_name - self._warning_label.set_markup(_(warning_label_text)) + warning_label_text = _(warning_label_template) % keymap_name + self._warning_label.set_markup(warning_label_text) # initialize with the previously set passphrase self.passphrase = self.data.autopart.passphrase @@ -147,9 +147,9 @@ class PassphraseDialog(GUIObject): sensitive = True if self._pwq_error: icon = "gtk-dialog-error" - msg = ERROR_WEAK % self._pwq_error + msg = _(ERROR_WEAK) % self._pwq_error sensitive = False - self._set_entry_icon(entry, icon, _(msg)) + self._set_entry_icon(entry, icon, msg) self._confirm_entry.set_sensitive(sensitive) if sensitive: -- 1.7.11.2

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches December 2012