September 2013 - anaconda-patches - Fedora mailing-lists

[PATCH] Mark language search string translatable. (#955229)
by Samantha N. Bueno 11 Feb '14

11 Feb '14

--- pyanaconda/ui/gui/spokes/welcome.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/welcome.glade b/pyanaconda/ui/gui/spokes/welcome.glade index f0a4602..4f79b7c 100644 --- a/pyanaconda/ui/gui/spokes/welcome.glade +++ b/pyanaconda/ui/gui/spokes/welcome.glade @@ -367,7 +367,7 @@ <property name="invisible_char">●</property> <property name="invisible_char_set">True</property> <property name="secondary_icon_name">edit-clear-symbolic</property> - <property name="placeholder_text">Type here to search.</property> + <property name="placeholder_text" translatable="yes">Type here to search.</property> <signal name="changed" handler="on_entry_changed" swapped="no"/> <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> </object> -- 1.7.11.7

3 3

[anaconda][PATCH] Allow hubs and standalone spokes decide if it is possible to continue
by Vratislav Podzimek 07 Jan '14

07 Jan '14

Related: rhbz#965797 Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/hubs/__init__.py | 29 +++++++++++++++++++++++++++-- pyanaconda/ui/gui/spokes/__init__.py | 18 ++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py index 37daf47..bb473b6 100644 --- a/pyanaconda/ui/gui/hubs/__init__.py +++ b/pyanaconda/ui/gui/hubs/__init__.py @@ -354,11 +354,36 @@ class Hub(GUIObject, common.Hub): self._update_spoke_id = GLib.timeout_add_seconds(1, self._update_spokes) - ### SIGNAL HANDLERS + @property + def continue_possible(self): + """ + Indicates whether it is possible to continue to the next action (hub, + standalone spoke,...). When overridden, IT IS THE HUB'S RESPONSIBILITY + to inform user, where the problem is and how to fix it. + + """ + + return True + + ### SIGNAL HANDLING + def _checked_continue(self, cb): + """ + Checks if continue is possible (from the hub's perspective and if yes, + runs the callback. + + """ + + if self.continue_possible: + cb() + + def _register_continue_event_cb(self, cb): + """Registers the callback for the continue event adding the check.""" + + self.continueButton.connect("clicked", lambda *args: self._checked_continue(cb)) def register_event_cb(self, event, cb): if event == "continue" and hasattr(self, "continueButton"): - self.continueButton.connect("clicked", lambda *args: cb()) + self._register_continue_event_cb(cb) elif event == "quit" and hasattr(self, "quitButton"): self.quitButton.connect("clicked", lambda *args: cb()) diff --git a/pyanaconda/ui/gui/spokes/__init__.py b/pyanaconda/ui/gui/spokes/__init__.py index c1a35b3..bb85e1e 100644 --- a/pyanaconda/ui/gui/spokes/__init__.py +++ b/pyanaconda/ui/gui/spokes/__init__.py @@ -63,9 +63,23 @@ class StandaloneSpoke(Spoke, common.StandaloneSpoke): Spoke.__init__(self, data) common.StandaloneSpoke.__init__(self, data, storage, payload, instclass) + @property + def continue_possible(self): + """ + Indicates whether it is possible to continue to the next action (hub, + standalone spoke,...). When overridden, IT IS THE SPOKES'S + RESPONSIBILITY to inform user, where the problem is and how to fix it. + + """ + + return True + + + ### SIGNAL HANDLING def _on_continue_clicked(self, cb): - self.apply() - cb() + if self.continue_possible: + self.apply() + cb() def register_event_cb(self, event, cb): if event == "continue": -- 1.7.11.7

2 4

[master/rhel7-branch] A bit controversial one for the MountpointSelectors' usage
by Vratislav Podzimek 04 Nov '13

04 Nov '13

The following patch fixes the bug #975838 by moving the focus changes handling from the MountpointSelector widget to the Page and spoke it appears in, respectively. The controversy lies in making the MountpointSelector's behaviour relying on the widget it is placed into. The MounpointSelector widget per se no longer handles focus changes correctly and it looks like being selected/chosen even if it loses focus. However, this is what we want -- to keep it look like that when user clicks to the right part of the screen to change parameters of the mount point being chosen. And since I doubt anybody will reuse the MountpointSelector as a standalone widget without the Page and the Accordion I think this change could be done. I've recorded a video preview [1] showing the functionality with this patch applied. [1] http://vpodzime.fedorapeople.org/MountpointSelector_focus.webm Let me know if I should add more comments to some places. Vratislav Podzimek (1): Handle focus changes of MountpointSelectors from outside (#975838) pyanaconda/ui/gui/spokes/custom.py | 2 ++ pyanaconda/ui/gui/spokes/lib/accordion.py | 6 ++++++ widgets/src/MountpointSelector.c | 31 ++++++++----------------------- 3 files changed, 16 insertions(+), 23 deletions(-) -- 1.7.11.7

2 3

[PATCH 1/2] DNFPayload: direct conf.persistdir to the sysimage.
by Ales Kozumplik 07 Oct '13

07 Oct '13

From: Ales Kozumplik <ales(a)redhat.com> So we get the history on the target. --- pyanaconda/packaging/dnfpayload.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py index b019723..7ee3344 100644 --- a/pyanaconda/packaging/dnfpayload.py +++ b/pyanaconda/packaging/dnfpayload.py @@ -135,7 +135,6 @@ class DNFPayload(packaging.PackagePayload): def _configure(self): self._base = dnf.Base() conf = self._base.conf - conf.persistdir = DNF_CACHE_DIR self._base.cache_c.prefix = DNF_CACHE_DIR self._base.cache_c.suffix = 'default' conf.logdir = '/tmp/payload-logs' @@ -144,8 +143,9 @@ class DNFPayload(packaging.PackagePayload): conf.errorlevel = 0 self._base.logging.setup_from_dnf_conf(conf) - conf.installroot = constants.ROOT_PATH conf.releasever = self._getReleaseVersion(None) + conf.installroot = constants.ROOT_PATH + conf.prepend_installroot('persistdir') # NSS won't survive the forking we do to shield out chroot during # transaction, disable it in RPM: -- 1.8.3.1

4 7

[blivet][rhel7-branch][PATCH] Add tmpfs support (#918621)
by Martin Kolman 03 Oct '13

03 Oct '13

This patch adds support for working with tmpfs "mounts" (well they are not really devices and don't really have a separate filesystem). Adding lines to fstab works fine (being the main point of the feature request) and other operations, such as mounting the filesystem, also work. I've been even able to start an installation to a tmpfs mount, with: part / --size=3000 --fstype=tmpfs And it got to about 3/4 before crashing the VM. :) BTW, regarding the feature request: * in Fedora, the tmps mount to /tmp is done by a systemd unit * this unit is also present in RHEL7, but it is disabled * there doesn't seem to be any straightforward way to set a size of such mount Therefore I've decided to handle this by extending blivet and the part kickstart command to support tmpfs, because it appears to be much more flexible: * you can easily set the size of the tmpfs mount with --size * you can use --grow and --maxsize * tmpfs options can be passed with --fsoptions * an arbitrary number of tmpfs partitions can be created, not just /tmp Martin Kolman (1): Add tmpfs support (#918621) blivet/__init__.py | 4 ++ blivet/deviceaction.py | 7 ++- blivet/devices.py | 24 ++++++++++ blivet/formats/fs.py | 125 ++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 157 insertions(+), 3 deletions(-) -- 1.8.3.1

3 6

[PATCH] Translate the "Quit" string at the end of liveinst.
by David Shea 30 Sep '13

30 Sep '13

--- pyanaconda/ui/gui/hubs/progress.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py index e052ff6..79daeee 100644 --- a/pyanaconda/ui/gui/hubs/progress.py +++ b/pyanaconda/ui/gui/hubs/progress.py @@ -200,7 +200,7 @@ class ProgressHub(Hub): continueText.set_text(_("%s is now successfully installed on your system and ready " "for you to use! When you are ready, reboot your system to start using it!")) continueText.set_line_wrap(True) - self.continueButton.set_label("_Quit") + self.continueButton.set_label(_("_Quit")) self._progressBar = self.builder.get_object("progressBar") self._progressLabel = self.builder.get_object("progressLabel") -- 1.8.3.1

2 1

[PATCH] Add additional checks for HFS+ ESP (#1010495)
by Brian C. Lane 30 Sep '13

30 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> This checks to make sure any partition we use meets the normal requirements for stage1 and is < 501.0MB and is not labeled "OSX" --- pyanaconda/bootloader.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index 55a93a2..07b8703 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1703,6 +1703,14 @@ class MacEFIGRUB(EFIGRUB): super(MacEFIGRUB, self).install() self.mactel_config() + def is_valid_stage1_device(self, device, early=False): + valid = super(MacEFIGRUB, self).is_valid_stage1_device(device, early) + + # Make sure we don't pick the OSX root partition + if valid and device.size < 501.0 and device.format.label != "OSX": + return True + + return False class YabootBase(BootLoader): def write_config_password(self, config): -- 1.8.3.1

2 2

[master/rhel7-branch] Fix issue where spoke returns to hub early in text mode. (#979375)
by Samantha N. Bueno 27 Sep '13

27 Sep '13

Not sure how this wasn't hit earlier than it was. If in the storage spoke in text mode, if you select any of the autopart options, you would immediately be returned to the summary hub, without getting to select a partition scheme. Resolves: rhbz#979375 --- pyanaconda/ui/tui/spokes/storage.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py index d73c2bc..79756b2 100644 --- a/pyanaconda/ui/tui/spokes/storage.py +++ b/pyanaconda/ui/tui/spokes/storage.py @@ -362,8 +362,7 @@ class AutoPartSpoke(NormalTUISpoke): number = int(key) self.clearPartType = PARTTYPES[self.parttypelist[number -1]] self.apply() - self.close() - return False + return None except (ValueError, KeyError, IndexError): return key -- 1.7.11.7

2 1

[master][PATCH] Grab journalctl logs if there is no /tmp/syslog
by Vratislav Podzimek 27 Sep '13

27 Sep '13

If we have our rsyslogd instance running and hooked to /tmp/syslog, we can simply grab logs from there. Otherwise we need to grab journalctl's output and filter it to omit our own log messages from there because there is no /var/log/messages anymore. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/exception.py | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py index 7c80ca7..2296af4 100644 --- a/pyanaconda/exception.py +++ b/pyanaconda/exception.py @@ -32,6 +32,7 @@ import shutil import signal import time import kickstart +import re import blivet.errors from pyanaconda.ui.communication import hubQ from pyanaconda.constants import ROOT_PATH, THREAD_EXCEPTION_HANDLING_TEST @@ -195,9 +196,8 @@ def initExceptionHandling(anaconda): "/tmp/program.log", "/tmp/storage.log", "/tmp/ifcfg.log", "/tmp/yum.log", ROOT_PATH + "/root/install.log", "/proc/cmdline" ] - if flags.flags.livecdInstall: - fileList.extend(["/var/log/messages"]) - else: + + if os.path.exists("/tmp/syslog"): fileList.extend(["/tmp/syslog"]) if anaconda.opts and anaconda.opts.ksfile: @@ -230,6 +230,11 @@ def initExceptionHandling(anaconda): attchmnt_only=True) conf.register_callback("type", lambda: "anaconda", attchmnt_only=True) + if "/tmp/syslog" not in fileList: + # no syslog, grab output from journalctl and put it also to the + # anaconda-tb file + conf.register_callback("journalctl", journalctl_callback, attchmnt_only=False) + handler = AnacondaExceptionHandler(conf, anaconda.intf.meh_interface, ReverseExceptionDump, anaconda.intf.tty_num) handler.install(anaconda) @@ -246,6 +251,20 @@ def nmcli_dev_list_callback(): return iutil.execWithCapture("nmcli", ["device", "show"]) +def journalctl_callback(): + """Callback to get logs from journalctl.""" + + # regex to filter log messages from anaconda's process (we have that in our + # logs) + anaconda_log_line = re.compile(r"\[%d\]:" % os.getpid()) + ret = "" + for line in iutil.execReadlines("journalctl", []): + if anaconda_log_line.search(line) is None: + # not an anaconda's message + ret += line + "\n" + + return ret + def test_exception_handling(): """ Function that can be used for testing exception handling in anaconda. It -- 1.7.11.7

2 1

[master/rhel7-branch][PATCH] Pass layout and variant in specific format to Gkbd (#1011155)
by Vratislav Podzimek 27 Sep '13

27 Sep '13

For some reason, the Gkbd requires to get layout and variant in a specific format nothing else uses. We need to make parse_layout_variant function public to use it from the Keyboard spoke. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/keyboard.py | 12 ++++++------ pyanaconda/ui/gui/spokes/keyboard.py | 4 +++- tests/pyanaconda_tests/keyboard_test.py | 16 ++++++++-------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py index 3cc540f..1911198 100644 --- a/pyanaconda/keyboard.py +++ b/pyanaconda/keyboard.py @@ -83,7 +83,7 @@ class InvalidLayoutVariantSpec(Exception): pass -def _parse_layout_variant(layout_variant_str): +def parse_layout_variant(layout_variant_str): """ Parse layout and variant from the string that may look like 'layout' or 'layout (variant)'. @@ -136,7 +136,7 @@ def normalize_layout_variant(layout_str): """ - layout, variant = _parse_layout_variant(layout_str) + layout, variant = parse_layout_variant(layout_str) return _join_layout_variant(layout, variant) def populate_missing_items(keyboard): @@ -612,7 +612,7 @@ class XklWrapper(object): try: #we can get 'layout' or 'layout (variant)' - (layout, variant) = _parse_layout_variant(layout) + (layout, variant) = parse_layout_variant(layout) except InvalidLayoutVariantSpec as ilverr: raise XklWrapperError("Failed to add layout: %s" % ilverr) @@ -640,7 +640,7 @@ class XklWrapper(object): """ #we can get 'layout' or 'layout (variant)' - (layout, variant) = _parse_layout_variant(layout) + (layout, variant) = parse_layout_variant(layout) layouts_variants = zip(self._rec.layouts, self._rec.variants) @@ -674,7 +674,7 @@ class XklWrapper(object): new_variants = list() for layout_variant in layouts_list: - (layout, variant) = _parse_layout_variant(layout_variant) + (layout, variant) = parse_layout_variant(layout_variant) new_layouts.append(layout) new_variants.append(variant) @@ -855,7 +855,7 @@ class LocaledWrapper(object): variants = [] for layout_variant in layouts_variants: - (layout, variant) = _parse_layout_variant(layout_variant) + (layout, variant) = parse_layout_variant(layout_variant) layouts.append(layout) variants.append(variant) diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py index 849981e..f7c8c99 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.py +++ b/pyanaconda/ui/gui/spokes/keyboard.py @@ -504,9 +504,11 @@ class KeyboardSpoke(NormalSpoke): if not layout_row: return + layout, variant = keyboard.parse_layout_variant(layout_row[0]) + lay_var_spec = "%s\t%s" % (layout, variant) dialog = Gkbd.KeyboardDrawing.dialog_new() Gkbd.KeyboardDrawing.dialog_set_layout(dialog, self._xkl_wrapper.configreg, - layout_row[0]) + lay_var_spec) dialog.set_size_request(750, 350) dialog.set_position(Gtk.WindowPosition.CENTER_ALWAYS) with enlightbox(self.window, dialog): diff --git a/tests/pyanaconda_tests/keyboard_test.py b/tests/pyanaconda_tests/keyboard_test.py index 1b8974d..8bad3f6 100644 --- a/tests/pyanaconda_tests/keyboard_test.py +++ b/tests/pyanaconda_tests/keyboard_test.py @@ -26,34 +26,34 @@ class ParsingAndJoiningTests(unittest.TestCase): """Should correctly parse keyboard layout and variant string specs.""" # valid layout variant specs - layout, variant = keyboard._parse_layout_variant("cz (qwerty)") + layout, variant = keyboard.parse_layout_variant("cz (qwerty)") self.assertEqual(layout, "cz") self.assertEqual(variant, "qwerty") - layout, variant = keyboard._parse_layout_variant("cz (dvorak-ucw)") + layout, variant = keyboard.parse_layout_variant("cz (dvorak-ucw)") self.assertEqual(layout, "cz") self.assertEqual(variant, "dvorak-ucw") # a valid layout variant spec with no variant specified - layout, variant = keyboard._parse_layout_variant("cz") + layout, variant = keyboard.parse_layout_variant("cz") self.assertEqual(layout, "cz") self.assertEqual(variant, "") # an invalid layout variant spec (missing layout) with self.assertRaises(keyboard.InvalidLayoutVariantSpec): - layout, variant = keyboard._parse_layout_variant("") + layout, variant = keyboard.parse_layout_variant("") # another invalid layout variant spec (invalid layout) with self.assertRaises(keyboard.InvalidLayoutVariantSpec): - layout, variant = keyboard._parse_layout_variant("&*&%$") + layout, variant = keyboard.parse_layout_variant("&*&%$") # another invalid layout variant spec (square brackets) with self.assertRaises(keyboard.InvalidLayoutVariantSpec): - layout, variant = keyboard._parse_layout_variant("cz [qwerty]") + layout, variant = keyboard.parse_layout_variant("cz [qwerty]") # another invalid layout variant spec (invalid variant) with self.assertRaises(keyboard.InvalidLayoutVariantSpec): - layout, variant = keyboard._parse_layout_variant("cz (&*&*)") + layout, variant = keyboard.parse_layout_variant("cz (&*&*)") def layout_variant_joining_test(self): """Should correctly join keyboard layout and variant to a string spec.""" @@ -70,7 +70,7 @@ class ParsingAndJoiningTests(unittest.TestCase): specs = ("cz", "cz (qwerty)") for spec in specs: - (layout, variant) = keyboard._parse_layout_variant(spec) + (layout, variant) = keyboard.parse_layout_variant(spec) self.assertEqual(spec, keyboard._join_layout_variant(layout, variant)) def layout_variant_normalize_test(self): -- 1.7.11.7

2 1

[PATCH] Remove another reference to log_picker.
by Chris Lumens 27 Sep '13

27 Sep '13

--- anaconda.spec.in | 1 - 1 file changed, 1 deletion(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index 14c3b9d..af78298 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -223,7 +223,6 @@ update-desktop-database &> /dev/null || : %{_datadir}/anaconda %{_prefix}/libexec/anaconda %{_libdir}/python*/site-packages/pyanaconda/* -%{_libdir}/python*/site-packages/log_picker/* %{_bindir}/analog %{_bindir}/anaconda-cleanup %ifarch %livearches -- 1.8.1.2

2 1

[PATCH] Use assertIsInstance in the kickstart version test.
by Chris Lumens 27 Sep '13

27 Sep '13

This fixes up the case where anaconda doesn't subclass a pykickstart class, but still needs to reference one - this case occurs due to initial-setup using anaconda. --- tests/kickstart_tests/version_test.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/kickstart_tests/version_test.py b/tests/kickstart_tests/version_test.py index 1e544b8..c3650f8 100644 --- a/tests/kickstart_tests/version_test.py +++ b/tests/kickstart_tests/version_test.py @@ -39,18 +39,14 @@ class BaseTestCase(unittest.TestCase): class CommandVersionTestCase(BaseTestCase): def commands_test(self): for (commandName, commandObj) in self._commandMap.iteritems(): - baseClass = commandObj().__class__.__bases__[0] pykickstartClass = self.handler.commands[commandName].__class__ - self.assertEqual(baseClass.__name__, pykickstartClass.__name__) + self.assertIsInstance(commandObj(), pykickstartClass) # Do the same thing as CommandVersionTestCase, but for data objects. class DataVersionTestCase(BaseTestCase): def data_test(self): for (dataName, dataObj) in self._dataMap.iteritems(): - baseClass = dataObj().__class__.__bases__[0] - # pykickstart does not expose data objects as a mapping the way # it does command objects. pykickstartClass = eval("self.handler.%s" % dataName) - - self.assertEqual(baseClass.__name__, pykickstartClass.__name__) + self.assertIsInstance(dataObj(), pykickstartClass) -- 1.8.1.2

2 1

[Lorax master/rhel7 1/2] Add macboot option (#1012529)
by Brian C. Lane 27 Sep '13

27 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> Add a macboot option to lorax and both macboot and nomacboot to lmc. Related: rhbz#1012529 --- src/sbin/livemedia-creator | 7 ++++++- src/sbin/lorax | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index a0a994b..c2996c9 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -521,7 +521,7 @@ def make_livecd(opts, mount_dir, work_dir): isolabel = isolabel[:32] log.warn("Truncating isolabel to 32 chars: %s" % (isolabel,)) - tb = TreeBuilder(product=product, arch=arch, + tb = TreeBuilder(product=product, arch=arch, domacboot=opts.domacboot, inroot=mount_dir, outroot=work_dir, runtime=RUNTIME, isolabel=isolabel, templatedir=joinpaths(opts.lorax_templates,"live/")) @@ -772,6 +772,11 @@ if __name__ == '__main__': help="Directory to copy the resulting images and iso into. " "Defaults to the temporary working directory") + parser.add_argument( "--macboot", action="store_true", default=True, + dest="domacboot") + parser.add_argument( "--nomacboot", action="store_false", + dest="domacboot") + # Group of arguments for appliance creation app_group = parser.add_argument_group("appliance arguments") app_group.add_argument( "--app-name", default=None, diff --git a/src/sbin/lorax b/src/sbin/lorax index a571c0b..b137f48 100755 --- a/src/sbin/lorax +++ b/src/sbin/lorax @@ -123,8 +123,10 @@ def main(args): help="build architecture", metavar="STRING") optional.add_option("--volid", default=None, help="volume id", metavar="STRING") + optional.add_option("--macboot", help="", + action="store_true", default=True, dest="domacboot") optional.add_option("--nomacboot", help="", - action="store_false", default=True, dest="domacboot") + action="store_false", dest="domacboot") optional.add_option("--noupgrade", help="", action="store_false", default=True, dest="doupgrade") optional.add_option("--logfile", default="./lorax.log", -- 1.8.3.1

2 2

[PATCH] Fix display of weak password warning (#1011850)
by David Shea 27 Sep '13

27 Sep '13

Only display the error message from libpwquality if one has been set. --- pyanaconda/ui/gui/spokes/user.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py index 39f7c42..aca7d95 100644 --- a/pyanaconda/ui/gui/spokes/user.py +++ b/pyanaconda/ui/gui/spokes/user.py @@ -548,8 +548,12 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke): if self._waivePasswordClicks > 1: return None elif self._waivePasswordClicks == 1: - return _("You have provided a weak password: %s. " - " Press Done again to use anyway.") % self._pwq_error + if self._pwq_error: + return _("You have provided a weak password: %s. " + " Press Done again to use anyway.") % self._pwq_error + else: + return _("You have provided a weak password. " + " Press Done again to use anyway.") else: error = _("The password you have provided is weak") if self._pwq_error: -- 1.8.3.1

3 2

[PATCH] Turn spinner back on for configuration
by Brian C. Lane 27 Sep '13

27 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> Some tasks, like rebuilding the initrd, take long enough that the spinner is helpful. --- pyanaconda/ui/gui/hubs/progress.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py index e89f7cf..e052ff6 100644 --- a/pyanaconda/ui/gui/hubs/progress.py +++ b/pyanaconda/ui/gui/hubs/progress.py @@ -68,6 +68,8 @@ class ProgressHub(Hub): if reenable_ransom: self._start_ransom_notes() + self._restart_spinner() + GLib.timeout_add(250, self._update_progress, self._configuration_done) threadMgr.add(AnacondaThread(name=THREAD_CONFIGURATION, target=doConfiguration, args=(self.storage, self.payload, self.data, self.instclass))) @@ -269,6 +271,12 @@ class ProgressHub(Hub): gtk_call_once(self._progressLabel.set_text, message) @gtk_action_nowait + def _restart_spinner(self): + spinner = self.builder.get_object("progressSpinner") + spinner.show() + spinner.start() + + @gtk_action_nowait def _progress_bar_complete(self): self._progressBar.set_fraction(1.0) self._progressLabel.set_text(_("Complete!")) -- 1.8.3.1

2 1

[PATCH] Fix the tui simpleline imports.
by David Shea 26 Sep '13

26 Sep '13

--- pyanaconda/ui/tui/__init__.py | 2 +- pyanaconda/ui/tui/tuiobject.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/tui/__init__.py b/pyanaconda/ui/tui/__init__.py index 9ce93a2..1b12fb9 100644 --- a/pyanaconda/ui/tui/__init__.py +++ b/pyanaconda/ui/tui/__init__.py @@ -23,7 +23,7 @@ from pyanaconda import ui from pyanaconda.ui.communication import hubQ from pyanaconda.flags import flags from pyanaconda.threads import threadMgr -import pyanaconda.ui.tui.simpleline as tui +from pyanaconda.ui.tui import simpleline as tui from pyanaconda.ui.tui.hubs.summary import SummaryHub from pyanaconda.ui.tui.spokes import StandaloneSpoke from pyanaconda.ui.tui.tuiobject import YesNoDialog, ErrorDialog diff --git a/pyanaconda/ui/tui/tuiobject.py b/pyanaconda/ui/tui/tuiobject.py index a6f06b9..ef1253d 100644 --- a/pyanaconda/ui/tui/tuiobject.py +++ b/pyanaconda/ui/tui/tuiobject.py @@ -21,7 +21,7 @@ from pyanaconda.i18n import _ from pyanaconda.ui import common -import pyanaconda.ui.tui.simpleline as tui +from pyanaconda.ui.tui import simpleline as tui from pyanaconda.constants_text import INPUT_PROCESSED class ErrorDialog(tui.UIScreen): -- 1.8.3.1

2 1

[master/rhel7] Clean up some rpmdiff errors (#1012624)
by Brian C. Lane 26 Sep '13

26 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> --- anaconda.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index 73ba9a3..3ef9faa 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -85,7 +85,7 @@ Requires: gnome-icon-theme-symbolic Requires: python-meh >= %{mehver} Requires: libreport-anaconda >= 2.0.21-1 Requires: libselinux-python -Requires: rpm-python >= %{rpmpythonver} +Requires: rpm-python Requires: parted >= %{partedver} Requires: pyparted >= %{pypartedver} Requires: yum >= %{yumver} @@ -121,7 +121,6 @@ Requires: NetworkManager >= %{nmver} Requires: nm-connection-editor Requires: dhclient Requires: anaconda-yum-plugins -Requires: libselinux-python >= %{libselinuxver} Requires: kbd Requires: chrony Requires: ntpdate @@ -160,6 +159,7 @@ This package contains a set of custom GTK+ widgets used by the anaconda installe Summary: Development files for anaconda-widgets Group: Development/Libraries Requires: glade +Requires: anaconda-widgets = %{version}-%{release} %description widgets-devel This package contains libraries and header files needed for writing the anaconda -- 1.8.3.1

2 1

[PATCH] Don't confuse users by misleading tooltip (#1011112)
by Vratislav Podzimek 26 Sep '13

26 Sep '13

If there is only one keyboard layout configured, the layout indicator shouldn't tell users that clicking it will switch layouts. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- widgets/src/LayoutIndicator.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/widgets/src/LayoutIndicator.c b/widgets/src/LayoutIndicator.c index c76768d..d77812b 100644 --- a/widgets/src/LayoutIndicator.c +++ b/widgets/src/LayoutIndicator.c @@ -28,7 +28,9 @@ #include "LayoutIndicator.h" #include "intl.h" -#define TOOLTIP_FORMAT_STR _("Current layout: '%s'. Click to switch to the next layout") +#define TOOLTIP_BASE_FORMAT_STR _("Current layout: '%s'. %s") +#define MULTIPLE_LAYOUTS_TIP _("Click to switch to the next layout.") +#define SINGLE_LAYOUT_TIP _("Add more layouts to enable switching.") #define DEFAULT_LAYOUT "us" #define DEFAULT_LABEL_MAX_CHAR_WIDTH 8 #define MARKUP_FORMAT_STR "<span fgcolor='black' weight='bold'>%s</span>" @@ -72,6 +74,7 @@ static void anaconda_layout_indicator_realize(GtkWidget *widget, gpointer user_d static void anaconda_layout_indicator_clicked(GtkWidget *widget, GdkEvent *event, gpointer user_data); static void anaconda_layout_indicator_refresh_ui_elements(AnacondaLayoutIndicator *indicator); static void anaconda_layout_indicator_refresh_layout(AnacondaLayoutIndicator *indicator); +static void anaconda_layout_indicator_refresh_tooltip(AnacondaLayoutIndicator *indicator); /* helper functions */ static gchar* get_current_layout(XklEngine *engine, XklConfigRec *conf_rec); @@ -311,15 +314,12 @@ static void anaconda_layout_indicator_clicked(GtkWidget *widget, GdkEvent *event static void anaconda_layout_indicator_refresh_ui_elements(AnacondaLayoutIndicator *self) { gchar *markup; - gchar *tooltip; markup = g_markup_printf_escaped(MARKUP_FORMAT_STR, self->priv->layout); gtk_label_set_markup(self->priv->layout_label, markup); g_free(markup); - tooltip = g_strdup_printf(TOOLTIP_FORMAT_STR, self->priv->layout); - gtk_widget_set_tooltip_text(GTK_WIDGET(self), tooltip); - g_free(tooltip); + anaconda_layout_indicator_refresh_tooltip(self); } static void anaconda_layout_indicator_refresh_layout(AnacondaLayoutIndicator *self) { @@ -331,6 +331,20 @@ static void anaconda_layout_indicator_refresh_layout(AnacondaLayoutIndicator *se anaconda_layout_indicator_refresh_ui_elements(self); } +static void anaconda_layout_indicator_refresh_tooltip(AnacondaLayoutIndicator *self) { + AnacondaLayoutIndicatorClass *klass = ANACONDA_LAYOUT_INDICATOR_GET_CLASS(self); + guint n_groups = xkl_engine_get_num_groups(klass->engine); + gchar *tooltip; + + if (n_groups > 1) + tooltip = g_strdup_printf(TOOLTIP_BASE_FORMAT_STR, self->priv->layout, MULTIPLE_LAYOUTS_TIP); + else + tooltip = g_strdup_printf(TOOLTIP_BASE_FORMAT_STR, self->priv->layout, SINGLE_LAYOUT_TIP); + + gtk_widget_set_tooltip_text(GTK_WIDGET(self), tooltip); + g_free(tooltip); +} + /** * get_current_layout: * @@ -457,6 +471,5 @@ void anaconda_layout_indicator_set_label_width(AnacondaLayoutIndicator *indicato * Since: 1.0 */ void anaconda_layout_indicator_retranslate(AnacondaLayoutIndicator *indicator) { - gtk_widget_set_tooltip_text(GTK_WIDGET(indicator), - g_strdup_printf(TOOLTIP_FORMAT_STR, indicator->priv->layout)); + anaconda_layout_indicator_refresh_tooltip(indicator); } -- 1.7.11.7

2 4

[PATCH] If the full device path is given in repo=hd:, still select it in the UI (#980479).
by Chris Lumens 26 Sep '13

26 Sep '13

--- pyanaconda/ui/gui/spokes/source.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index 869bba2..20fb331 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -650,7 +650,7 @@ class SourceSpoke(NormalSpoke): "label" : dev.format.label or dev.format.uuid or "" } store.append([dev, "%(model)s %(path)s (%(size)s MB) %(format)s %(label)s" % dev_info]) - if self.data.method.method == "harddrive" and dev.name == self.data.method.partition: + if self.data.method.method == "harddrive" and self.data.method.partition in [dev.path, dev.name]: active = idx added = True idx += 1 -- 1.8.1.2

2 1

[rhel7-branch][PATCH] Add tmpfs support
by Martin Kolman 26 Sep '13

26 Sep '13

This makes it possible to create arbitrary tmpfs mounts using the kickstart part command, for example: part /tmp --fstype=tmpfs --size=700 part /foo --fstype=tmpfs --maxsize=500 --grow And as --size only supports integers, explicit size in % of RAM can be set like this: part /bar --fstype=tmpfs --fsoptions="size=25%" So far this works with kickstart, custom partitioning seems to have some issues with it and I'm investigating them. Martin Kolman (1): Add tmpfs support (#918621) pyanaconda/kickstart.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 1.8.3.1

1 1

[PATCH] Display newly created partitions without a mountpoint, too (#886039).
by Chris Lumens 26 Sep '13

26 Sep '13

Swap, for instance, does not have a mountpoint. So the first partition was always getting displayed on the right hand side when swap was made. This probably applies to other non-mountpoint formats too. --- pyanaconda/ui/gui/spokes/custom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 2d784d1..4361c8a 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -2051,7 +2051,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self._devices = self.__storage.devices if not self._error: - self._do_refresh(mountpointToShow=mountpoint) + self._do_refresh(mountpointToShow=mountpoint or fstype) else: self._do_refresh() self._updateSpaceDisplay() @@ -2127,7 +2127,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): if not page: page = self._current_page - log.debug("show first mountpoint: %s", page.pageTitle) + log.debug("show mountpoint: %s", page.pageTitle) if not page.members: self._clear_current_selector() return @@ -2137,7 +2137,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): return for member in page.members: - if member.get_property("mountpoint") == mountpoint: + if member.get_property("mountpoint").lower() == mountpoint.lower(): self.on_selector_clicked(member) break -- 1.8.1.2

2 1

[PATCH v2] git pre-commit hook
by David Shea 26 Sep '13

26 Sep '13

This removes all of the `git show' stuff so that the hook runs against the working tree instead of the staged commit, but adds an error if a python file in the commit does not match a file in the working tree. I removed the --displayname parameter to runpylint.sh, but I kept the part where it prints the filename instead of the module name.

2 2

[master] Run pylint on everything
by David Shea 26 Sep '13

26 Sep '13

Just because it's not in pyanaconda doesn't mean we shouldn't hold it to the same standards. This also changes the pre-commit hook to run against the code staged to commit instead of the code on the filesystem, which may be helpful.

3 25

[PATCH] Don't require pressing escape twice to kill the media check window (#965625).
by Chris Lumens 26 Sep '13

26 Sep '13

Also, allow the user to cancel media check while it's working. --- pyanaconda/ui/gui/spokes/source.glade | 1 + pyanaconda/ui/gui/spokes/source.py | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade index 91d716d..554d673 100644 --- a/pyanaconda/ui/gui/spokes/source.glade +++ b/pyanaconda/ui/gui/spokes/source.glade @@ -91,6 +91,7 @@ <property name="type_hint">dialog</property> <property name="decorated">False</property> <property name="has_resize_grip">False</property> + <signal name="close" handler="on_close" swapped="no"/> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index 7bcae6e..869bba2 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -25,7 +25,7 @@ import time import logging log = logging.getLogger("anaconda") -import os.path +import os, signal from gi.repository import GLib @@ -155,6 +155,7 @@ class MediaCheckDialog(GUIObject): def __init__(self, data): GUIObject.__init__(self, data) self.progressBar = self.builder.get_object("mediaCheck-progressBar") + self._pid = None def _checkisoEndsCB(self, pid, status): doneButton = self.builder.get_object("doneButton") @@ -168,6 +169,7 @@ class MediaCheckDialog(GUIObject): self.progressBar.set_fraction(1.0) doneButton.set_sensitive(True) GLib.spawn_close_pid(pid) + self._pid = None def _checkisoStdoutWatcher(self, fd, condition): if condition == GLib.IOCondition.HUP: @@ -187,7 +189,7 @@ class MediaCheckDialog(GUIObject): return True def run(self, devicePath): - (retval, pid, _stdin, stdout, _stderr) = \ + (retval, self._pid, _stdin, stdout, _stderr) = \ GLib.spawn_async_with_pipes(None, ["checkisomd5", "--gauge", devicePath], [], GLib.SpawnFlags.DO_NOT_REAP_CHILD|GLib.SpawnFlags.SEARCH_PATH, None, None) @@ -195,13 +197,19 @@ class MediaCheckDialog(GUIObject): return # This function waits for checkisomd5 to end and then cleans up after it. - GLib.child_watch_add(pid, self._checkisoEndsCB) + GLib.child_watch_add(self._pid, self._checkisoEndsCB) # This function watches the process's stdout. GLib.io_add_watch(stdout, GLib.IOCondition.IN|GLib.IOCondition.HUP, self._checkisoStdoutWatcher) self.window.run() + def on_close(self, *args): + if self._pid: + os.kill(self._pid, signal.SIGKILL) + + self.window.destroy() + def on_done_clicked(self, *args): self.window.destroy() -- 1.8.1.2

1 0

[rhel7] Fixup Eula class
by Brian C. Lane 26 Sep '13

26 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> Related: rhbz#1000409 --- pyanaconda/kickstart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 10a2bde..a736972 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -635,7 +635,7 @@ class Lang(commands.lang.F19_Lang): localization.write_language_configuration(self, ROOT_PATH) # no overrides needed here -class Eula = commands.eula.F20_Eula +Eula = commands.eula.F20_Eula class LogVol(commands.logvol.F20_LogVol): def execute(self, storage, ksdata, instClass): -- 1.8.3.1

3 2

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches September 2013