September 2013 - anaconda-patches - Fedora mailing-lists

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

10 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 "%s" @@ -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

[rhel7-branch] fix bootloader installation to disk images
by David Lehman 25 Sep '13

25 Sep '13

Fixing the bug referenced in the follow-up message's subject uncovered another issue that will keep freshly-installed disk images from booting successfully, but it's a step in the right direction. If anyone knows how to tell dracut to not resolve devices in order to write out devexists-whatever systemd unit files, I'd love to hear about it. Ideally, what I'd like is a way to push resolution of fstab device specs to boot time (as opposed to initramfs creation time).

2 2

[rhel7-branch] Rebase our language/locale handling code
by Vratislav Podzimek 25 Sep '13

25 Sep '13

There has been major changes of the language/locale handling code done in the F20 cycle which significantly improve user experience of the installer and also make our code cleaner, more deterministic and better documented. On behalf of the bug #1006458 [1] all these 14 patches should be ported from master to rhel7-branch. They contain a lot of changes, but they are just ports of the master patches, so they should be okay. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1006458 Vratislav Podzimek (14): Rewrite the localization module Adapt to the new localization module Fix the langcode parsing regexp Specify also query script when getting locale's native name Remove an unused argument of get_available_translations Allow seting up locale without modifying ksdata Rework the Welcome spoke to allow users choose from all locales Get rid of the non-deterministic expand_langs and its usage Match langs with stripped accents when filtering languages Rework the Langsupport spoke to work with all locales Share code between the Welcome and Langsupport spokes More robust parsing of the layout and variant string specification Normalize keyboard layout and variant strings from langtable Center the Langsupport spoke's description anaconda | 38 +- anaconda.spec.in | 3 +- pyanaconda/keyboard.py | 59 +- pyanaconda/localization.py | 716 ++++++++++----------- pyanaconda/packaging/yumpayload.py | 9 +- pyanaconda/timezone.py | 36 +- pyanaconda/ui/gui/hubs/progress.py | 53 +- pyanaconda/ui/gui/spokes/langsupport.glade | 172 +++-- pyanaconda/ui/gui/spokes/langsupport.py | 204 +++--- .../ui/gui/spokes/lib/lang_locale_handler.py | 161 +++++ pyanaconda/ui/gui/spokes/welcome.glade | 336 +++++----- pyanaconda/ui/gui/spokes/welcome.py | 260 +++----- pyanaconda/ui/gui/utils.py | 40 ++ 13 files changed, 1108 insertions(+), 979 deletions(-) create mode 100644 pyanaconda/ui/gui/spokes/lib/lang_locale_handler.py -- 1.7.11.7

2 15

[master][PATCH] Allow searching for keyboard layouts in English (#1009806)
by Vratislav Podzimek 25 Sep '13

25 Sep '13

Even though we have the keyboard layouts's descriptions translated it may be easier to filter them using English especially when using ASCII-based layout and a non-ascii language (e.g. Japanesse). Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/keyboard.py | 20 +++++++++++++++----- pyanaconda/ui/gui/spokes/keyboard.py | 36 +++++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py index e86771a..5124db4 100644 --- a/pyanaconda/keyboard.py +++ b/pyanaconda/keyboard.py @@ -530,7 +530,7 @@ class XklWrapper(object): return self._switch_opt_infos.iterkeys() - def get_layout_variant_description(self, layout_variant, with_lang=True): + def get_layout_variant_description(self, layout_variant, with_lang=True, xlated=True): """ Get description of the given layout-variant. @@ -539,20 +539,30 @@ class XklWrapper(object): :param with_lang: whether to include language of the layout-variant (if defined) in the description or not :type with_lang: bool + :param xlated: whethe to return translated or english version of the description + :type xlated: bool :return: description of the layout-variant specification (e.g. 'Czech (qwerty)') :rtype: str """ layout_info = self._layout_infos[layout_variant] + if xlated: + description = Xkb_(layout_info.desc).decode("utf-8") + else: + description = layout_info.desc + if with_lang and layout_info.lang: # translate language and upcase its first letter, translate the # layout-variant description - xlated_lang = iso_(layout_info.lang) - return "%s (%s)" % (iutil.upcase_first_letter(xlated_lang.decode("utf-8")), - Xkb_(layout_info.desc).decode("utf-8")) + if xlated: + lang = iso_(layout_info.lang).decode("utf-8") + else: + lang = layout_info.lang + + return "%s (%s)" % (iutil.upcase_first_letter(lang), description) else: - return layout_info.desc + return description def get_switch_opt_description(self, switch_opt): """ diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py index 7c575d8..2d2c904 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.py +++ b/pyanaconda/ui/gui/spokes/keyboard.py @@ -61,23 +61,29 @@ class AddLayoutDialog(GUIObject): self._chosen_layouts = [] def matches_entry(self, model, itr, user_data=None): + def have_word_match(str1, str2): + """Tells if all words from str1 exist in str2 or not.""" + + if str1 is None or str2 is None: + return False + + str1 = str1.lower() + str1_words = str1.split() + + try: + str2 = str2.lower() + for word in str1_words: + str2.index(word) + return True + except ValueError: + return False + value = model[itr][0] - value = self._xkl_wrapper.get_layout_variant_description(value) + eng_value = self._xkl_wrapper.get_layout_variant_description(value, xlated=False) + xlated_value = self._xkl_wrapper.get_layout_variant_description(value) entry_text = self._entry.get_text() - if entry_text is not None: - entry_text = entry_text.lower() - entry_text_words = entry_text.split() - else: - return False - try: - if value: - value = value.lower() - for word in entry_text_words: - value.index(word) - return True - return False - except ValueError: - return False + + return have_word_match(entry_text, eng_value) or have_word_match(entry_text, xlated_value) def compare_layouts(self, model, itr1, itr2, user_data=None): """ -- 1.7.11.7

2 1

[PATCH] Allow a proxy to be set before the method is saved
by David Shea 25 Sep '13

25 Sep '13

--- pyanaconda/ui/gui/spokes/source.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index 7bcae6e..8b150c5 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -784,11 +784,11 @@ class SourceSpoke(NormalSpoke): self._verifyIsoButton.set_sensitive(True) def on_proxy_clicked(self, button): - # If this method has no proxy, ignore the click if not hasattr(self.data.method, "proxy"): - return + old_proxy = None + else: + old_proxy = self.data.method.proxy - old_proxy = self.data.method.proxy dialog = ProxyDialog(self.data) with enlightbox(self.window, dialog.window): dialog.refresh() -- 1.8.3.1

2 2

[master/rhel7-branch] Not so nice patch for a painful issue
by Vratislav Podzimek 25 Sep '13

25 Sep '13

Any suggestions how to fix this in a better way are more than welcome. Vratislav Podzimek (1): Make Software spoke ready even if there is no repo (#1010348) pyanaconda/ui/tui/spokes/software.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) -- 1.7.11.7

2 2

[PATCH rhel7-branch] network, ports of patches to r7
by Radek Vykydal 25 Sep '13

25 Sep '13

All of the patches except for [3/9] are ports from master so it is the [3/9] that asks for review the most. https://bugzilla.redhat.com/show_bug.cgi?id=1011826 [1/9], [2/9], [3/9] https://bugzilla.redhat.com/show_bug.cgi?id=1011841 [4/9] https://bugzilla.redhat.com/show_bug.cgi?id=1011855 [5/9] https://bugzilla.redhat.com/show_bug.cgi?id=1011860 [6/9] https://bugzilla.redhat.com/show_bug.cgi?id=1011866 [7/9] https://bugzilla.redhat.com/show_bug.cgi?id=1011928 [8/9], [9/9]

2 10

[master][PATCH] Escape the status before setting it as markup
by Vratislav Podzimek 24 Sep '13

24 Sep '13

The spoke's status may contain characters that need to be escaped before used as markup. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/hubs/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py index 3042b51..f142a18 100644 --- a/pyanaconda/ui/gui/hubs/__init__.py +++ b/pyanaconda/ui/gui/hubs/__init__.py @@ -257,7 +257,7 @@ class Hub(GUIObject, common.Hub): def _updateCompleteness(self, spoke): spoke.selector.set_sensitive(spoke.ready) spoke.selector.set_property("status", spoke.status) - spoke.selector.set_tooltip_markup(spoke.status) + spoke.selector.set_tooltip_markup(GLib.markup_escape_text(spoke.status)) spoke.selector.set_incomplete(not spoke.completed and spoke.mandatory) self._handleCompleteness(spoke) -- 1.7.11.7

2 1

[master][PATCH] Make the keyboard layout preview dialog bigger (#1011140)
by Vratislav Podzimek 24 Sep '13

24 Sep '13

Otherwise it may be hard to read some characters. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/keyboard.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py index ffab6da..d35eb2f 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.py +++ b/pyanaconda/ui/gui/spokes/keyboard.py @@ -501,6 +501,7 @@ class KeyboardSpoke(NormalSpoke): dialog = Gkbd.KeyboardDrawing.dialog_new() Gkbd.KeyboardDrawing.dialog_set_layout(dialog, self._xkl_wrapper.configreg, layout_row[0]) + dialog.set_size_request(750, 350) with enlightbox(self.window, dialog): dialog.show_all() dialog.run() -- 1.7.11.7

2 3

[master][PATCH] Return switching options with the same order as shown (#1011130)
by Vratislav Podzimek 24 Sep '13

24 Sep '13

The switching options dialog lists all available switching options ordered alphabetically. When returning checked options it should keep the same ordering not to confuse users. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/keyboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py index d35eb2f..a943d1f 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.py +++ b/pyanaconda/ui/gui/spokes/keyboard.py @@ -238,7 +238,7 @@ class ConfigureSwitchingDialog(GUIObject): def checked_options(self): """Property returning all checked options from the list""" - ret = [row[0] for row in self._switchingOptsStore if row[1] and row[0]] + ret = [row[0] for row in self._switchingOptsSort if row[1] and row[0]] return ret def on_use_option_toggled(self, renderer, path, *args): -- 1.7.11.7

2 1

[initial-setup] EULA agreement
by Vratislav Podzimek 24 Sep '13

24 Sep '13

These patches add EULA agreement support to our tools. Patches for the Initial Setup fix issues that prevent adding spokes to it and introduce the EULA Agreement spoke. The patches for pykickstart and anaconda add and export the eula kickstart command. -- 1.7.11.7

2 13

[PATCH] Add translation support to check_accelerators
by David Shea 24 Sep '13

24 Sep '13

Added a --translate option to check_accelerators.py. When set, it will check all of the translated keyboard accelerators in addition to the English ones. Changed the exception check so that language information can be included as . Added support for the new parameter to the run_check_accelerators.sh wrapper script. `make check' will not check translations. Requires python-polib to parse the .po files. --- tests/accelerators/check_accelerators.py | 127 +++++++++++++++++++++++---- tests/accelerators/run_check_accelerators.sh | 18 +++- 2 files changed, 126 insertions(+), 19 deletions(-) diff --git a/tests/accelerators/check_accelerators.py b/tests/accelerators/check_accelerators.py index 892ff2b..461220a 100755 --- a/tests/accelerators/check_accelerators.py +++ b/tests/accelerators/check_accelerators.py @@ -22,6 +22,8 @@ import argparse import re import os.path import copy +import collections +import locale try: from lxml import etree @@ -30,33 +32,80 @@ except ImportError: sys.exit(1) accel_re = re.compile(r'_(?P<accel>.)') - success = True -def add_check_accel(glade_filename, accels, label): + +# Only used when --translate is requested. +class PODict(collections.Mapping): + def __init__(self, filename): + try: + import polib + except ImportError: + print("You need to install the python-polib package to check translations") + sys.exit(1) + + self._dict = {} + + pofile = polib.pofile(filename) + self.metadata = pofile.metadata + for entry in pofile.translated_entries(): + self._dict[entry.msgid] = entry.msgstr + + def __getitem__(self, key): + return self._dict[key] + + def __iter__(self): + return self._dict.__iter__() + + def __len__(self): + return len(self._dict) + +def is_exception(node, language=None): + if language: + comment_str = "check_accelerators(%s)" % language + else: + comment_str = "check_accelerators" + + return bool(node.xpath("./parent::*/comment()[contains(., '%s')]" % comment_str)) + +def add_check_accel(glade_filename, accels, label, po_map): """Check whether an accelerator conflicts with existing accelerators. and add it to the current accelerator context. """ global success + language = None + if po_map: + if label.text not in po_map: + return + label.text = po_map[label.text] + language = po_map.metadata['Language'] + match = accel_re.search(label.text) if match: accel = match.group('accel').lower() if accel in accels: # Check for an exception comment - prev = label.getprevious() - if (prev is not None) and (prev.tag == etree.Comment) and \ - prev.text.strip().startswith('check_accelerators:'): + if is_exception(label, language): return - print("Accelerator collision for key %s in %s\n line %d: %s\n line %d: %s" %\ - (accel, os.path.normpath(glade_filename), - accels[accel].sourceline, accels[accel].text, - label.sourceline, label.text)) + if language: + lang_str = " for language %s" % language + else: + lang_str = "" + + try: + print(("Accelerator collision for key %s in %s%s\n line %d: %s\n line %d: %s" %\ + (accel, os.path.normpath(glade_filename), lang_str, + accels[accel].sourceline, accels[accel].text, + label.sourceline, label.text)).encode("utf-8")) + except UnicodeEncodeError: + import pdb; pdb.set_trace() + raise success = False else: accels[accel] = label -def combine_accels(glade_filename, list_a, list_b): +def combine_accels(glade_filename, list_a, list_b, po_map): if not list_a: return list_b if not list_b: @@ -67,7 +116,7 @@ def combine_accels(glade_filename, list_a, list_b): for accels_b in list_b: new_accels = copy.copy(accels_a) for accel in accels_b.keys(): - add_check_accel(glade_filename, new_accels, accels_b[accel]) + add_check_accel(glade_filename, new_accels, accels_b[accel], po_map) newlist.append(new_accels) return newlist @@ -80,7 +129,7 @@ def combine_accels(glade_filename, list_a, list_b): # these is compared against the list of accelerators returned for the object's # other GtkNotebook children. -def process_object(glade_filename, interface_object): +def process_object(glade_filename, interface_object, po_map): """Process keyboard shortcuts for a given glade object. The return value from this function is a list of accelerator @@ -94,12 +143,12 @@ def process_object(glade_filename, interface_object): # Add everything that isn't a child of a GtkNotebook for label in interface_object.xpath(".//property[@name='label' and ../property[@name='use_underline']/text() = 'True' and not(ancestor::object[@class='GtkNotebook'])]"): - add_check_accel(glade_filename, accels[0], label) + add_check_accel(glade_filename, accels[0], label, po_map) # For each GtkNotebook tab that is not a child of another notebook, # add the tab to the top-level context for notebook_label in interface_object.xpath(".//object[@class='GtkNotebook' and not(ancestor::object[@class='GtkNotebook'])]/child[@type='tab']//property[@name='label' and ../property[@name='use_underline']/text() = 'True']"): - add_check_accel(glade_filename, accels[0], notebook_label) + add_check_accel(glade_filename, accels[0], notebook_label, po_map) # Now process each non-tab object in each Gtknotebook that is not a child # of another notebook. For each Gtk notebook, each non-tab child represents @@ -129,34 +178,76 @@ def process_object(glade_filename, interface_object): # Create the list of dictionaries for the notebook notebook_list = [] for child in notebook.xpath("./child[not(@type='tab')]"): - notebook_list.extend(process_object(glade_filename, copy.deepcopy(child))) + notebook_list.extend(process_object(glade_filename, copy.deepcopy(child), po_map)) # Now combine this with our list of accelerators - accels = combine_accels(glade_filename, accels, notebook_list) + accels = combine_accels(glade_filename, accels, notebook_list, po_map) return accels -def check_glade(glade_filename): +def check_glade(glade_filename, po_map=None): with open(glade_filename) as glade_file: # Parse the XML glade_tree = etree.parse(glade_file) # Treat each top-level object as a separate context for interface_object in glade_tree.xpath("/interface/object"): - process_object(glade_filename, interface_object) + process_object(glade_filename, interface_object, po_map) def main(argv=None): if argv is None: argv = sys.argv parser = argparse.ArgumentParser("Check for duplicated accelerators") + parser.add_argument("-t", "--translate", action='store_true', + help="Check translated strings") + parser.add_argument("-p", "--podir", action='store', type=str, + metavar='PODIR', help='Directory containing po files', default='./po') parser.add_argument("glade_files", nargs="+", metavar="GLADE-FILE", help='The glade file to check') args = parser.parse_args(args=argv) + # First check the untranslated strings in each file for glade_file in args.glade_files: check_glade(glade_file) + # Now loop over all of the translations + if args.translate: + import langtable + + with open(os.path.join(args.podir, 'LINGUAS')) as linguas: + for line in linguas.readlines(): + if re.match(r'^#', line): + continue + + for lang in line.strip().split(" "): + # Reset the locale to C before parsing the po file because + # polib has erroneous uses of lower(). + # See https://bitbucket.org/izi/polib/issue/54/pofile-parsing-crashes-in-turkish-… + locale.setlocale(locale.LC_ALL, 'C') + po_map = PODict(os.path.join(args.podir, lang + ".po")) + + # Set the locale so that we can use lower() on accelerator keys. + # If the language is of the form xx_XX, use that as the + # locale name. Otherwise use the first locale that + # langtable returns for the language. If that doesn't work, + # just use C and hope for the best. + if '_' in lang: + locale.setlocale(locale.LC_ALL, lang) + else: + locale_list = langtable.list_locales(languageId=lang) + if locale_list: + try: + locale.setlocale(locale.LC_ALL, locale_list[0]) + except locale.Error: + print("No such locale %s, using C" % locale_list[0]) + locale.setlocale(locale.LC_ALL, 'C') + else: + locale.setlocale(locale.LC_ALL, 'C') + + for glade_file in args.glade_files: + check_glade(glade_file, po_map) + if __name__ == "__main__": main(sys.argv[1:]) diff --git a/tests/accelerators/run_check_accelerators.sh b/tests/accelerators/run_check_accelerators.sh index a49cda1..401f081 100755 --- a/tests/accelerators/run_check_accelerators.sh +++ b/tests/accelerators/run_check_accelerators.sh @@ -3,4 +3,20 @@ : "${top_srcdir:=$(dirname "$0")/../..}" srcdir="${top_srcdir}/tests/accelerators" -find "${top_srcdir}" -name '*.glade' -exec "${srcdir}/check_accelerators.py" {} + +# If --translate was specified but not --podir, add --podir +i=0 +translate_set=0 +podir_set=0 +for arg in "$@" ; do + if [ "$arg" = "--translate" -o "$arg" = "-t" ]; then + translate_set=1 + elif [ "$arg" = "--podir" -o "$arg" = "-p" ]; then + podir_set=1 + fi +done + +if [ "$translate_set" -eq 1 -a "$podir_set" -eq 0 ]; then + set -- "$@" --podir "${top_srcdir}/po" +fi + +find "${top_srcdir}" -name '*.glade' -exec "${srcdir}/check_accelerators.py" "$@" {} + -- 1.8.3.1

2 2

[PATCH] Don't rely on X server adding empty variant for its defaults (#1011658)
by Vratislav Podzimek 24 Sep '13

24 Sep '13

The X server keeps "matching" lists of layouts and variants that, when combined together, give a list of what is actually set for input handling. However, for the default layout, the X server doesn't add the empty "" variant to make the lists actually matching. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/keyboard.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py index e86771a..48a2789 100644 --- a/pyanaconda/keyboard.py +++ b/pyanaconda/keyboard.py @@ -514,7 +514,11 @@ class XklWrapper(object): cur_group = num_groups - 1 layout = self._rec.layouts[cur_group] - variant = self._rec.variants[cur_group] + try: + variant = self._rec.variants[cur_group] + except IndexError: + # X server may have forgotten to add the "" variant for its default layout + variant = "" self._engine.stop_listen(Xkl.EngineListenModes.TRACK_KEYBOARD_STATE) -- 1.7.11.7

2 1

[master][PATCH] Make sure autopart type is handled deterministicaly in text mode (#1010453)
by Vratislav Podzimek 24 Sep '13

24 Sep '13

We should use OrderedDict instead of plain dict if we want to rely on the ordering of its items. Also don't subtract 1 when getting the autopart type, we subtract 1 in the input method and also the default value is set to reflect that. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/tui/spokes/storage.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py index 66b58a8..714c590 100644 --- a/pyanaconda/ui/tui/spokes/storage.py +++ b/pyanaconda/ui/tui/spokes/storage.py @@ -38,6 +38,8 @@ from pyanaconda.i18n import _, P_ from pykickstart.constants import CLEARPART_TYPE_ALL, CLEARPART_TYPE_LINUX, CLEARPART_TYPE_NONE +from collections import OrderedDict + import logging log = logging.getLogger("anaconda") @@ -377,8 +379,8 @@ class PartitionSchemeSpoke(NormalTUISpoke): def __init__(self, app, data, storage, payload, instclass): NormalTUISpoke.__init__(self, app, data, storage, payload, instclass) - self.partschemes = {"Standard Partition": AUTOPART_TYPE_PLAIN, - "BTRFS": AUTOPART_TYPE_BTRFS, "LVM": AUTOPART_TYPE_LVM} + self.partschemes = OrderedDict([("Standard Partition", AUTOPART_TYPE_PLAIN), + ("LVM", AUTOPART_TYPE_LVM), ("BTRFS", AUTOPART_TYPE_BTRFS)]) @property def indirect(self): @@ -420,7 +422,7 @@ class PartitionSchemeSpoke(NormalTUISpoke): schemelist = self.partschemes.values() try: - self.data.autopart.type = schemelist[self._selection - 1] + self.data.autopart.type = schemelist[self._selection] except IndexError: # we shouldn't ever see this, but just in case, don't crash. # when autopart.type is detected as None in AutoPartSpoke.apply(), -- 1.7.11.7

2 1

[master][PATCH] Make Keyboard spoke's status consistent with other statuses (#1011166)
by Vratislav Podzimek 24 Sep '13

24 Sep '13

When multiple keyboard layouts are configured, we should list them in the status as we do with the other spokes. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/keyboard.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py index 7c575d8..ffab6da 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.py +++ b/pyanaconda/ui/gui/spokes/keyboard.py @@ -298,7 +298,9 @@ class KeyboardSpoke(NormalSpoke): @property def status(self): # We don't need to check that self._store is empty, because that isn't allowed. - return self._xkl_wrapper.get_layout_variant_description(self._store[0][0]) + descriptions = (self._xkl_wrapper.get_layout_variant_description(row[0]) + for row in self._store) + return ", ".join(descriptions) def initialize(self): NormalSpoke.initialize(self) -- 1.7.11.7

2 1

Re: [PATCH] support ppc64le architecture
by Mark Hamzy 24 Sep '13

24 Sep '13

vpodzime(a)redhat.com wrote on 09/24/2013 01:12:35 PM: > This looks good to me. However, is it really all we need to support > ppc64le? As far as I know at this time, yes. The ppc64le architecture is still being developed. -- Mark You must be the change you wish to see in the world. -- Mahatma Gandhi Never let the future disturb you. You will meet it, if you have to, with the same weapons of reason which today arm you against the present. -- Marcus Aurelius

1 0

[master][PATCH] Use g_signal_handler_disconnect instead of g_object_disconnect (#1010486)
by Vratislav Podzimek 24 Sep '13

24 Sep '13

Usage of g_object_disconnect is more complicated and if not passed all arguments it expects, it produces a warning. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- widgets/src/BaseWindow.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/widgets/src/BaseWindow.c b/widgets/src/BaseWindow.c index 67aac36..e8f9df6 100644 --- a/widgets/src/BaseWindow.c +++ b/widgets/src/BaseWindow.c @@ -90,6 +90,7 @@ enum { struct _AnacondaBaseWindowPrivate { gboolean is_beta, info_shown; + gulong clicked_handler_id; GtkWidget *main_box, *event_box, *info_bar; GtkWidget *alignment; GtkWidget *nav_box, *nav_area, *action_area; @@ -482,8 +483,8 @@ static void anaconda_base_window_set_info_bar(AnacondaBaseWindow *win, GtkMessag * bar is hidden. */ gtk_widget_add_events(GTK_WIDGET(win->priv->event_box), GDK_BUTTON_RELEASE_MASK); - g_signal_connect(win->priv->event_box, "button-release-event", - G_CALLBACK(anaconda_base_window_info_bar_clicked), win); + win->priv->clicked_handler_id = g_signal_connect(win->priv->event_box, "button-release-event", + G_CALLBACK(anaconda_base_window_info_bar_clicked), win); content_area = gtk_info_bar_get_content_area(GTK_INFO_BAR(win->priv->info_bar)); @@ -562,7 +563,7 @@ void anaconda_base_window_clear_info(AnacondaBaseWindow *win) { if (!win->priv->info_shown) return; - g_object_disconnect(win->priv->info_bar, "button-release-event", NULL); + g_signal_handler_disconnect(win->priv->info_bar, win->priv->clicked_handler_id); gtk_widget_hide(win->priv->info_bar); gtk_widget_destroy(win->priv->info_bar); -- 1.7.11.7

2 2

[PATCH] support ppc64le architecture
by Mark Hamzy 24 Sep '13

24 Sep '13

Support PowerPC little endian architecture. --- blivet/arch.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blivet/arch.py b/blivet/arch.py index dd2f630..cbbf5e6 100644 --- a/blivet/arch.py +++ b/blivet/arch.py @@ -268,13 +268,13 @@ def isPPC(bits=None): arch = os.uname()[4] if bits is None: - if arch == 'ppc' or arch == 'ppc64': + if arch in ('ppc', 'ppc64', 'ppc64le'): return True elif bits == 32: - if arch == 'ppc': + if arch in ('ppc'): return True elif bits == 64: - if arch == 'ppc64': + if arch in ('ppc64', 'ppc64le'): return True return False -- 1.8.1.4

2 1

[PATCH] Skip non-udev devices as optical media candidates (#1009809)
by David Shea 24 Sep '13

24 Sep '13

--- pyanaconda/image.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyanaconda/image.py b/pyanaconda/image.py index 5fe3833..a7422ec 100644 --- a/pyanaconda/image.py +++ b/pyanaconda/image.py @@ -193,6 +193,10 @@ def opticalInstallMedia(devicetree, mountpoint=INSTALL_TREE): # created from ISO images. for dev in set(devicetree.getDevicesByType("cdrom") + \ [d for d in devicetree.devices if d.format.type == "iso9660"]): + if not dev.sysfsPath: + # No udev information + continue + devicetree.updateDeviceFormat(dev) if not hasattr(dev.format, "mount"): # no mountable media -- 1.8.3.1

3 7

[master][PATCH] Pass the actual format instead of Python built-in (#1009678)
by Vratislav Podzimek 24 Sep '13

24 Sep '13

Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/kickstart.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 13160d9..603d957 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -625,9 +625,8 @@ class Lang(commands.lang.F19_Lang): def execute(self, *args, **kwargs): localization.write_language_configuration(self, ROOT_PATH) -class Eula(commands.eula.F20_Eula): - # no overrides needed here - pass +# no overrides needed here +class Eula = commands.eula.F20_Eula class LogVol(commands.logvol.F20_LogVol): def execute(self, storage, ksdata, instClass): @@ -755,7 +754,7 @@ class LogVolData(commands.logvol.F20_LogVolData): raise KickstartValueError(formatErrorMsg(self.lineno, msg="Invalid target size (%d) for device %s" % (self.size, device.name))) - devicetree.registerAction(ActionCreateFormat(device, format)) + devicetree.registerAction(ActionCreateFormat(device, fmt)) else: # If a previous device has claimed this mount point, delete the # old one. -- 1.7.11.7

2 2

[PATCH] V2 network gui: do not crash on devices without settings (eg wireless) (#1010519)
by Radek Vykydal 24 Sep '13

24 Sep '13

Also do not read slaves from settings but use new 'Slaves' property to read current slaves instead. --- pyanaconda/network.py | 15 ++++++--------- pyanaconda/nm.py | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index dcb6ee0..03dbaec 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -34,6 +34,7 @@ import threading import re import dbus import IPy +import itertools from simpleconfig import SimpleConfigFile from blivet.devices import FcoeDiskDevice, iScsiDiskDevice @@ -1046,22 +1047,18 @@ def status_message(): slaves = {} ssids = {} - nonslaves = [] # first find slaves and wireless aps for devname in active_devs: - master = nm.nm_device_setting_value(devname, "connection", "master") - if master: - if master in slaves: - slaves[master].append(devname) - else: - slaves[master] = [devname] - else: - nonslaves.append(devname) + slaves[devname] = nm.nm_device_slaves(devname) or [] if nm.nm_device_type_is_wifi(devname): ssids[devname] = nm.nm_device_active_ssid(devname) or "" + all_slaves = set(itertools.chain.from_iterable(slaves.values())) + nonslaves = [dev for dev in active_devs if dev not in all_slaves] + if len(nonslaves) == 1: + devname = nonslaves[0] if nm.nm_device_type_is_ethernet(devname): msg = _("Wired (%(interface_name)s) connected") \ % {"interface_name": devname} diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py index 3c587dc..17b765d 100644 --- a/pyanaconda/nm.py +++ b/pyanaconda/nm.py @@ -440,6 +440,29 @@ def nm_device_ip_config(name, version=4): return [addr_list, ns_list] +def nm_device_slaves(name): + """Return slaves of device. + + :param name: name of device + :type name: str + :return: names of slaves of device or None if device has no 'Slaves' property + :rtype: list of strings or None + :raise UnknownDeviceError if device is not found + """ + + try: + slaves = nm_device_property(name, "Slaves") + except PropertyNotFoundError: + return None + + slave_ifaces = [] + for slave in slaves: + iface = _get_property(slave, "Interface", ".Device") + slave_ifaces.append(iface) + + return slave_ifaces + + def nm_ntp_servers_from_dhcp(): """Return NTP servers obtained by DHCP. -- 1.7.11.7

2 1

[master][PATCH] Don't allow usaging updates with non-default network sources (#1008028)
by Vratislav Podzimek 24 Sep '13

24 Sep '13

Otherwise we don't know which repository if the one with updates. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/source.py | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index bc72564..27ffd90 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -545,6 +545,9 @@ class SourceSpoke(NormalSpoke): # updates option container self._updatesBox = self.builder.get_object("updatesBox") + self._proxyButton = self.builder.get_object("proxyButton") + self._nfsOptsBox = self.builder.get_object("nfsOptsBox") + def initialize(self): NormalSpoke.initialize(self) @@ -753,6 +756,15 @@ class SourceSpoke(NormalSpoke): enabled = button.get_active() relatedBox.set_sensitive(enabled) + if button in (self._autodetectButton, self._isoButton): + # just make updates check box sensitive and unchecked by default + self._noUpdatesCheckbox.set_active(False) + self._updatesBox.set_sensitive(True) + else: + # network source selected, setup updates check box based on protocol + # chosen + self._protocolComboBox.emit("changed") + def on_chooser_clicked(self, button): dialog = IsoChooser(self.data) @@ -814,19 +826,21 @@ class SourceSpoke(NormalSpoke): dialog.run("/dev/" + self._cdrom.name) def on_protocol_changed(self, combo): - proxyButton = self.builder.get_object("proxyButton") - nfsOptsBox = self.builder.get_object("nfsOptsBox") - # Only allow the URL entry to be used if we're using an HTTP/FTP # method that's not the mirror list, or an NFS method. self._urlEntry.set_sensitive(self._http_active() or self._ftp_active() or self._nfs_active()) # Only allow thse widgets to be shown if it makes sense for the # the currently selected protocol. - proxyButton.set_sensitive(self._http_active() or self._mirror_active()) - nfsOptsBox.set_visible(self._nfs_active()) + self._proxyButton.set_sensitive(self._http_active() or self._mirror_active()) + self._nfsOptsBox.set_visible(self._nfs_active()) self._mirrorlistCheckbox.set_visible(self._http_active()) + # We only know how to enable updates if the default mirror is used. + # don't disable updates by default + self._noUpdatesCheckbox.set_active(not self._mirror_active()) + self._updatesBox.set_sensitive(self._mirror_active()) + def _update_payload_repos(self): """ Change the packaging repos to match the new edits -- 1.7.11.7

2 3

[PATCH] Changed the keyboard accelerator for iscsi "Retry Log In"
by David Shea 23 Sep '13

23 Sep '13

check_accelerators was actually right about this one: retryLoginButton can appear at the same time as the "_Reverse CHAP Username" input. Changed the Log In button to use L instead of R and removed the check_accelerators exception. --- pyanaconda/ui/gui/spokes/advstorage/iscsi.glade | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade index 208122a..d1597d3 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade +++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade @@ -1161,8 +1161,7 @@ </child> <child> <object class="GtkButton" id="retryLoginButton"> -  - <property name="label" translatable="yes">_Retry Log In</property> + <property name="label" translatable="yes">Retry _Log In</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> -- 1.8.3.1

2 1

[PATCH] Only fail on a missing firewalld command if the firewall is enabled (#1004976).
by Chris Lumens 23 Sep '13

23 Sep '13

If the user gives firewall --disabled and their package set does not include the firewalld package, we should not raise an error. The firewall will be disabled on the target system due to the lack of firewalld. --- pyanaconda/kickstart.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 05e855d..3856814 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -525,8 +525,9 @@ class Firewall(commands.firewall.F14_Firewall): cmd = "/usr/bin/firewall-offline-cmd" if not os.path.exists(ROOT_PATH+cmd): - msg = _("%s is missing. Cannot setup firewall.") % (cmd,) - raise KickstartError(msg) + if self.enabled: + msg = _("%s is missing. Cannot setup firewall.") % (cmd,) + raise KickstartError(msg) else: iutil.execWithRedirect(cmd, args, root=ROOT_PATH) -- 1.8.1.2

2 1

[PATCH] Make rescue mode work with encrypted installations
by Vratislav Podzimek 23 Sep '13

23 Sep '13

I don't like the idea of adding more code to the rescue mode we have now, but rewriting it to our new Text UI is a harder and long-term task. Moreover, the newly added function could survive the rewrite untouched. Vratislav Podzimek (1): Unlock encrypted partitions before finding installations (#901917) pyanaconda/rescue.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) -- 1.7.11.7

3 6

[python-meh] Filter local variables in a nicer way and fix docstring
by Vratislav Podzimek 23 Sep '13

23 Sep '13

The localSkipList is used as a list of substrings that are searched in variable names to determine if those should be skipped or not. Both the code and docstring should reflect that in a readable way. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- meh/__init__.py | 2 +- meh/dump.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meh/__init__.py b/meh/__init__.py index 6497bf4..75b6a21 100644 --- a/meh/__init__.py +++ b/meh/__init__.py @@ -65,7 +65,7 @@ class Config(object): fileList -- A list of files to find on the system and add to the traceback dump. localSkipList -- A list of strings. When handling a traceback, - any local variables found with the same name as + any local variables found with their name containing an element of this list will not be written to the dump. This is subtely different from attrSkipList. diff --git a/meh/dump.py b/meh/dump.py index 0a769f2..9fe9003 100644 --- a/meh/dump.py +++ b/meh/dump.py @@ -420,9 +420,9 @@ class ExceptionDump(object): ret += "\nLocal variables in innermost frame:\n" try: for (key, value) in frame.f_locals.items(): - loweredKey = key.lower() - if len(filter(lambda s: loweredKey.find(s) != -1, - self.conf.localSkipList)) > 0: + lowered_key = key.lower() + if any(item.lower() in lowered_key + for item in self.conf.localSkipList): continue ret += "%s: %s\n" % (key, value) -- 1.7.11.7

2 1

[PATCH] network gui: do not crash on devices without settings (eg wireless) (#1010519)
by Radek Vykydal 23 Sep '13

23 Sep '13

Also do not read slaves from settings but use new 'Slaves' property to read current slaves instead. --- pyanaconda/network.py | 21 +++++++++------------ pyanaconda/nm.py | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index dcb6ee0..18ea892 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -34,6 +34,7 @@ import threading import re import dbus import IPy +import itertools from simpleconfig import SimpleConfigFile from blivet.devices import FcoeDiskDevice, iScsiDiskDevice @@ -1046,22 +1047,16 @@ def status_message(): slaves = {} ssids = {} - nonslaves = [] # first find slaves and wireless aps for devname in active_devs: - master = nm.nm_device_setting_value(devname, "connection", "master") - if master: - if master in slaves: - slaves[master].append(devname) - else: - slaves[master] = [devname] - else: - nonslaves.append(devname) + slaves[devname] = nm.nm_device_slaves(devname) or [] if nm.nm_device_type_is_wifi(devname): ssids[devname] = nm.nm_device_active_ssid(devname) or "" - if len(nonslaves) == 1: + all_slaves = set(itertools.chain.from_iterable(slaves.values())) + + if len(active_devs) - len(all_slaves) == 1: if nm.nm_device_type_is_ethernet(devname): msg = _("Wired (%(interface_name)s) connected") \ % {"interface_name": devname} @@ -1077,9 +1072,11 @@ def status_message(): vlanid = nm.nm_device_setting_value(devname, "vlan", "id") msg = _("Vlan %(interface_name)s (%(parent_device)s, ID %(vlanid)s) connected") \ % {"interface_name": devname, "parent_device": parent, "vlanid": vlanid} - elif len(nonslaves) > 1: + elif len(active_devs) - len(all_slaves) > 1: devlist = [] - for devname in nonslaves: + for devname in active_devs: + if devname in all_slaves: + continue if nm.nm_device_type_is_ethernet(devname): devlist.append("%s" % devname) elif nm.nm_device_type_is_wifi(devname): diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py index 3c587dc..17b765d 100644 --- a/pyanaconda/nm.py +++ b/pyanaconda/nm.py @@ -440,6 +440,29 @@ def nm_device_ip_config(name, version=4): return [addr_list, ns_list] +def nm_device_slaves(name): + """Return slaves of device. + + :param name: name of device + :type name: str + :return: names of slaves of device or None if device has no 'Slaves' property + :rtype: list of strings or None + :raise UnknownDeviceError if device is not found + """ + + try: + slaves = nm_device_property(name, "Slaves") + except PropertyNotFoundError: + return None + + slave_ifaces = [] + for slave in slaves: + iface = _get_property(slave, "Interface", ".Device") + slave_ifaces.append(iface) + + return slave_ifaces + + def nm_ntp_servers_from_dhcp(): """Return NTP servers obtained by DHCP. -- 1.7.11.7

1 1

[PATCH] Cleanup some pylint failures in the network module
by Brian C. Lane 23 Sep '13

23 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> --- pyanaconda/network.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index dcb6ee0..f2f28a9 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -226,18 +226,18 @@ class IfcfgFile(SimpleConfigFile): SimpleConfigFile.__init__(self, always_quote=True, filename=filename) self._dirty = False - def read(self): + def read(self, filename=None): self.reset() ifcfglog.debug("IfcfFile.read %s", self.filename) SimpleConfigFile.read(self) self._dirty = False - def write(self, filename=None): + def write(self, filename=None, use_tmp=False): if self._dirty or filename: # ifcfg-rh is using inotify IN_CLOSE_WRITE event so we don't use # temporary file for new configuration ifcfglog.debug("IfcfgFile.write %s:\n%s", self.filename, self.__str__()) - SimpleConfigFile.write(self, filename, use_tmp=False) + SimpleConfigFile.write(self, filename, use_tmp=use_tmp) self._dirty = False def set(self, *args): @@ -582,7 +582,6 @@ def ifcfg_to_ksdata(ifcfg, devname): def hostname_ksdata(hostname): from pyanaconda.kickstart import AnacondaKSHandler handler = AnacondaKSHandler() - kwargs = {} # pylint: disable-msg=E1101 return handler.NetworkData(hostname=hostname, bootProto="") @@ -1047,6 +1046,7 @@ def status_message(): slaves = {} ssids = {} nonslaves = [] + devname = "" # first find slaves and wireless aps for devname in active_devs: -- 1.8.3.1

2 1

[master/rhel7] LiveImageKSPayload skip the parent class setup method (#1010500)
by Brian C. Lane 23 Sep '13

23 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> LiveImageKSPayload mounts the image itself, so call the ImagePayload setup method instead. Resolves: rhbz#1010500 --- pyanaconda/packaging/livepayload.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py index 377dc46..b9a4814 100644 --- a/pyanaconda/packaging/livepayload.py +++ b/pyanaconda/packaging/livepayload.py @@ -210,7 +210,8 @@ class LiveImageKSPayload(LiveImagePayload): def setup(self, storage): """ Check the availability and size of the image. """ - super(LiveImageKSPayload, self).setup(storage) + # This is on purpose, we don't want to call LiveImagePayload's setup method. + ImagePayload.setup(self, storage) self._proxies = {} if self.data.method.proxy: -- 1.8.3.1

2 1

[initial-setup] Another console that needs to wait for us
by Vratislav Podzimek 23 Sep '13

23 Sep '13

I've filed a systemd bug [1] to allow stop this nonsense. Let's see when they fix it... [1] https://bugzilla.redhat.com/show_bug.cgi?id=1010428 Vratislav Podzimek (1): Yet another serial console in ARMs (#1007163) systemd/initial-setup-text.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.7.11.7

3 4

[PATCH] Add GtkNotebook support to the acclerators check.
by David Shea 20 Sep '13

20 Sep '13

This removes the need for most of the exception comments. The only exceptions left are one in installation source where elements are shown and hidden based on a radio button selection, and one in the iscsi login where elements are shown and hidden based on a dropdown. --- pyanaconda/ui/gui/spokes/advstorage/iscsi.glade | 11 +- pyanaconda/ui/gui/spokes/custom.glade | 2 - pyanaconda/ui/gui/spokes/filter.glade | 7 -- pyanaconda/ui/gui/spokes/network.glade | 4 - tests/accelerators/check_accelerators.py | 150 ++++++++++++++++++------ 5 files changed, 117 insertions(+), 57 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade index 98fb46f..208122a 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade +++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade @@ -397,7 +397,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> -  <property name="label" translatable="yes">CHAP _Username:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">rchapUsernameEntry</property> @@ -414,7 +413,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> -  <property name="label" translatable="yes">CHAP _Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">rchapPasswordEntry</property> @@ -764,7 +762,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> -  <property name="label" translatable="yes">_Node login authentication type:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginAuthTypeCombo</property> @@ -823,7 +820,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> -  <property name="label" translatable="yes">CHAP _Username:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginChapUsernameEntry</property> @@ -840,7 +836,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> -  <property name="label" translatable="yes">CHAP _Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginChapPasswordEntry</property> @@ -967,7 +962,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> -  <property name="label" translatable="yes">CHAP _Username:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginRchapUsernameEntry</property> @@ -984,7 +978,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> -  <property name="label" translatable="yes">CHAP _Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginRchapPasswordEntry</property> @@ -1001,7 +994,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> -  <property name="label" translatable="yes">_Reverse CHAP Username:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginRchapReverseUsername</property> @@ -1018,7 +1010,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> -  <property name="label" translatable="yes">Reverse CHAP Pass_word:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginRchapReversePassword</property> @@ -1170,7 +1161,7 @@ </child> <child> <object class="GtkButton" id="retryLoginButton"> -  +  <property name="label" translatable="yes">_Retry Log In</property> <property name="visible">True</property> <property name="can_focus">True</property> diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index 1b5de13..2c45c5f 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -1364,7 +1364,6 @@ until you click on the main menu's 'Begin Installation' button.</property> <object class="GtkLabel" id="passphraseLabel"> <property name="visible">True</property> <property name="can_focus">False</property> -  <property name="label" translatable="yes">_Passphrase:</property> <property name="use_underline">True</property> <attributes> @@ -1393,7 +1392,6 @@ until you click on the main menu's 'Begin Installation' button.</property> </child> <child> <object class="GtkButton" id="unlockButton"> -  <property name="label" translatable="yes">_Unlock</property> <property name="visible">True</property> <property name="can_focus">True</property> diff --git a/pyanaconda/ui/gui/spokes/filter.glade b/pyanaconda/ui/gui/spokes/filter.glade index e98ed1a..8c50349 100644 --- a/pyanaconda/ui/gui/spokes/filter.glade +++ b/pyanaconda/ui/gui/spokes/filter.glade @@ -641,7 +641,6 @@ <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="can_focus">False</property> -  <property name="label" translatable="yes">Show Only _Devices With:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">multipathInterconnectCombo</property> @@ -682,7 +681,6 @@ <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="can_focus">False</property> -  <property name="label" translatable="yes">Show Only _Devices Containing:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">multipathWWIDEntry</property> @@ -901,7 +899,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> -  <property name="label" translatable="yes">_Filter By:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">multipathTypeCombo</property> @@ -960,7 +957,6 @@ <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="can_focus">False</property> -  <property name="label" translatable="yes">Show Only _Devices From:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">otherVendorCombo</property> @@ -1001,7 +997,6 @@ <object class="GtkLabel" id="label20"> <property name="visible">True</property> <property name="can_focus">False</property> -  <property name="label" translatable="yes">Show Only _Devices With:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">otherInterconnectCombo</property> @@ -1042,7 +1037,6 @@ <object class="GtkLabel" id="label21"> <property name="visible">True</property> <property name="can_focus">False</property> -  <property name="label" translatable="yes">Show Only _Devices Containing:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">otherIDEntry</property> @@ -1272,7 +1266,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> -  <property name="label" translatable="yes">_Filter By:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">zFilterCombo</property> diff --git a/pyanaconda/ui/gui/spokes/network.glade b/pyanaconda/ui/gui/spokes/network.glade index 14ec157..5701e68 100644 --- a/pyanaconda/ui/gui/spokes/network.glade +++ b/pyanaconda/ui/gui/spokes/network.glade @@ -1641,7 +1641,6 @@ updates available for you.</property> <property name="top_padding">12</property> <child> <object class="GtkButton" id="button_mobilebb_options"> -  <property name="label" translatable="yes">_Configure...</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1927,7 +1926,6 @@ updates available for you.</property> <property name="top_padding">12</property> <child> <object class="GtkButton" id="button_vpn_options"> -  <property name="label" translatable="yes">_Configure...</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -2083,7 +2081,6 @@ updates available for you.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> -  <property name="label" translatable="yes">_Configuration URL</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_proxy_url</property> @@ -2162,7 +2159,6 @@ updates available for you.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> -  <property name="label" translatable="yes">_Socks Host</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry_proxy_socks</property> diff --git a/tests/accelerators/check_accelerators.py b/tests/accelerators/check_accelerators.py index dff3c3f..e4a5f56 100755 --- a/tests/accelerators/check_accelerators.py +++ b/tests/accelerators/check_accelerators.py @@ -21,6 +21,7 @@ import sys import argparse import re import os.path +import copy try: from lxml import etree @@ -30,55 +31,136 @@ except ImportError: accel_re = re.compile(r'_(?P<accel>.)') +success = True +def add_check_accel(glade_filename, accels, label): + """Check whether an accelerator conflicts with existing accelerators. + and add it to the current accelerator context. + """ + global success + + match = accel_re.search(label.text) + if match: + accel = match.group('accel').lower() + if accel in accels: + # Check for an exception comment + prev = label.getprevious() + if (prev is not None) and (prev.tag == etree.Comment) and \ + prev.text.strip().startswith('check_accelerators:'): + return + + print("Accelerator collision for key %s in %s\n line %d: %s\n line %d: %s" %\ + (accel, os.path.normpath(glade_filename), + accels[accel].sourceline, accels[accel].text, + label.sourceline, label.text)) + success = False + else: + accels[accel] = label + +def combine_accels(glade_filename, list_a, list_b): + if not list_a: + return list_b + if not list_b: + return list_a + + newlist = [] + for accels_a in list_a: + for accels_b in list_b: + new_accels = copy.copy(accels_a) + for accel in accels_b.keys(): + add_check_accel(glade_filename, new_accels, accels_b[accel]) + newlist.append(new_accels) + return newlist + +# GtkNotebook widgets define several child widgets, not all of which are active +# at the same time. To further complicate things, an object can have more than +# one GtkNotebook child, and a GtkNotebook and have GtkNotebook children. +# +# To handle this, GtkNotebook objects are processed separately. +# process_notebook returns a list of possible accelerator lists, and each of +# these is compared against the list of accelerators returned for the object's +# other GtkNotebook children. + +def process_object(glade_filename, interface_object): + """Process keyboard shortcuts for a given glade object. + + The return value from this function is a list of accelerator + dictionaries, with each consiting of accelerator shortcut characters + as keys and the corresponding <object> Element objects as values. Each + dictionary represents a set of accelerators that could be active at any + given time. + """ + # Start with an empty context for things that are always active + accels = [{}] + + # Add everything that isn't a child of a GtkNotebook + for label in interface_object.xpath(".//property[@name='label' and ../property[@name='use_underline']/text() = 'True' and not(ancestor::object[@class='GtkNotebook'])]"): + add_check_accel(glade_filename, accels[0], label) + + # For each GtkNotebook tab that is not a child of another notebook, + # add the tab to the top-level context + for notebook_label in interface_object.xpath(".//object[@class='GtkNotebook' and not(ancestor::object[@class='GtkNotebook'])]/child[@type='tab']//property[@name='label' and ../property[@name='use_underline']/text() = 'True']"): + add_check_accel(glade_filename, accels[0], notebook_label) + + # Now process each non-tab object in each Gtknotebook that is not a child + # of another notebook. For each Gtk notebook, each non-tab child represents + # a separate potentially-active context. Since each list returned by + # process_object for a GtkNotebook child is independent of each other + # GtkNotebook child, we can just combine all of them into a single list. + # For example, say there's a notebook with two panes. The first pane + # contains another notebook with two panes. Let's call the main pane + # A, and the panes in the child GtkNotebook A_1 and A_2. A contains an + # accelerator for 'a', A_1 contains accelerators for 'b' and 'c', and A_2 + # contains accelerators for 'b' and 'c'. The list returned would look like: + # [{'a': label1, 'b': label2, 'c': label3}, + # {'a': label1, 'b': label4, 'c': label5}] + # Then when we process the other pane in the Notebook that contains A + # (let's call it B), we find acclerators for 'a' and 'b': + # [{'a': label6, 'b': label7}]. + # None of these dictionaries are active at the same time. Because + # process_object on A combined the accelerators that are in the top-level + # of A with each of the accelerators in the Notebook children of A, we can + # treat A as if it were actually two panes at the same-level of B and just + # create a list of three dictionaries for the whole notebook. + # + # A deepcopy of each object is taken so that the object can be treated as a + # separate XML document so that the ancestor axis stuff works. + + for notebook in interface_object.xpath(".//object[@class='GtkNotebook' and not(ancestor::object[@class='GtkNotebook'])]"): + # Create the list of dictionaries for the notebook + notebook_list = [] + for child in notebook.xpath("./child[not(@type='tab')]"): + notebook_list.extend(process_object(glade_filename, copy.deepcopy(child))) + + # Now combine this with our list of accelerators + accels = combine_accels(glade_filename, accels, notebook_list) + + return accels + def check_glade(glade_filename): - success = True with open(glade_filename) as glade_file: # Parse the XML glade_tree = etree.parse(glade_file) - # Assume that each top-level object is a separate context + # Treat each top-level object as a separate context for interface_object in glade_tree.xpath("/interface/object"): - accels = {} - - # Select the label properties of objects whose use_underline - # property is true. - # NB: This is why we can't use python's builtin etree - for label in interface_object.xpath(".//property[@name='label' and ../property[@name='use_underline']/text() = 'True']"): - match = accel_re.search(label.text) - if match: - accel = match.group('accel').lower() - if accel in accels: - # Check for an exception comment - prev = label.getprevious() - if (prev is not None) and (prev.tag == etree.Comment) and \ - prev.text.strip().startswith('check_accelerators:'): - continue - - print("Accelerator collision for key %s in %s:%s\n line %d: %s\n line %d: %s" %\ - (accel, os.path.normpath(glade_filename), interface_object.attrib['id'], - accels[accel].sourceline, accels[accel].text, - label.sourceline, label.text)) - success = False - else: - accels[accel] = label - return success - -def main(argv=sys.argv): + process_object(glade_filename, interface_object) + +def main(argv=None): + if argv is None: + argv = sys.argv + parser = argparse.ArgumentParser("Check for duplicated accelerators") parser.add_argument("glade_files", nargs="+", metavar="GLADE-FILE", help='The glade file to check') args = parser.parse_args(args=argv) - success = True for glade_file in args.glade_files: - if not check_glade(glade_file): - success = False - return success + check_glade(glade_file) if __name__ == "__main__": - result = main(sys.argv[1:]) + main(sys.argv[1:]) - if result: + if success: sys.exit(0) else: sys.exit(1) -- 1.8.3.1

2 1

[PATCH] Encrypt normal user passwords when doing text install. (#977732)
by Samantha N. Bueno 20 Sep '13

20 Sep '13

There isn't currently a bug against it, but I'd really like to see this go into rhel7-branch as well. Thoughts? ==== More than simply mirroring graphical behavior, passwords shouldn't be stored plaintext in the first place. --- pyanaconda/ui/tui/spokes/__init__.py | 6 ++++-- pyanaconda/ui/tui/spokes/user.py | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pyanaconda/ui/tui/spokes/__init__.py b/pyanaconda/ui/tui/spokes/__init__.py index 087199b..773ea67 100644 --- a/pyanaconda/ui/tui/spokes/__init__.py +++ b/pyanaconda/ui/tui/spokes/__init__.py @@ -226,8 +226,10 @@ class EditTUISpoke(NormalTUISpoke): def _prep_password(i, entry): number = tui.TextWidget("%2d)" % i) title = tui.TextWidget(_(entry.title)) - value = getdeepattr(self.args, entry.attribute) - value = tui.TextWidget("".join(["*"] * len(value))) + value = "" + if len(getdeepattr(self.args, entry.attribute)) > 0: + value = _("Password set.") + value = tui.TextWidget(value) return tui.ColumnWidget([(3, [number]), (None, [title, value])], 1) diff --git a/pyanaconda/ui/tui/spokes/user.py b/pyanaconda/ui/tui/spokes/user.py index 6185f80..2b0d3f2 100644 --- a/pyanaconda/ui/tui/spokes/user.py +++ b/pyanaconda/ui/tui/spokes/user.py @@ -1,4 +1,4 @@ -# Root password text spoke +# User creation text spoke # # Copyright (C) 2013 Red Hat, Inc. # @@ -22,7 +22,7 @@ from pyanaconda.ui.tui.spokes import EditTUISpoke from pyanaconda.ui.tui.spokes import EditTUISpokeEntry as Entry from pyanaconda.ui.common import FirstbootSpokeMixIn -from pyanaconda.users import guess_username +from pyanaconda.users import guess_username, cryptPassword from pyanaconda.i18n import _ from pykickstart.constants import FIRSTBOOT_RECONFIG from pyanaconda.constants import ANACONDA_ENVIRON, FIRSTBOOT_ENVIRON @@ -123,3 +123,15 @@ class UserSpoke(FirstbootSpokeMixIn, EditTUISpoke): self.data.user.userList.append(self.args) elif (not self.args._create) and (self.args in self.data.user.userList): self.data.user.userList.remove(self.args) + + # encrypt and store password only if user entered anything; this should + # preserve passwords set via kickstart + if self.args._use_password and len(self.args.password) > 0: + self.args.password = cryptPassword(self.args.password) + self.args.isCrypted = True + self.args.password_kickstarted = False + # clear pw when user unselects to use pw + else: + self.args.password = "" + self.args.isCrypted = False + self.args.password_kickstarted = False -- 1.7.11.7

2 1

[rhel7-branch] patch to allow use of wwid-based names for mpath
by David Lehman 20 Sep '13

20 Sep '13

This replaces the checkbutton from rhel6 with a command line option to disable friendly names. Multipathd makes this nice and simple for us.

3 4

[PATCH] Forbid "root" as a user or group name. (#968451)
by David Shea 20 Sep '13

20 Sep '13

This also fixes the handling of single-character names, which were mistakenly forbidden before. --- pyanaconda/regexes.py | 7 +++++-- tests/regex_tests/username_test.py | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/pyanaconda/regexes.py b/pyanaconda/regexes.py index 44acc0b..5859e59 100644 --- a/pyanaconda/regexes.py +++ b/pyanaconda/regexes.py @@ -38,10 +38,13 @@ GECOS_VALID = re.compile(r'^[^:]*$') # and UT_NAMESIZE for user names (which is defined as 32 bits/utmp.h). This # expression captures all of that: the initial character, followed by either # up to 30 portable characters and a dollar sign or up to 31 portable characters, -# both for a maximum total of 32. The empty string is not allowed. +# both for a maximum total of 32. The empty string is not allowed. "root" is not +# allowed. # a base expression without anchors, helpful for building other expressions -_USERNAME_BASE = r'[a-zA-Z0-9._](([a-zA-Z0-9._-]{,30}\$)|([a-zA-Z0-9._-]{,31}))' +# If the string is the right length to match "root", use a lookback expression +# to make sure it isn't. +_USERNAME_BASE = r'[a-zA-Z0-9._](([a-zA-Z0-9._-]{1,2})|([a-zA-Z0-9._-]{3}(?<!root))|([a-zA-Z0-9._-]{,30}\$)|([a-zA-Z0-9._-]{4,31}))?' USERNAME_VALID = re.compile(r'^' + _USERNAME_BASE + '$') GROUPNAME_VALID = USERNAME_VALID diff --git a/tests/regex_tests/username_test.py b/tests/regex_tests/username_test.py index 9877410..0c0d5d2 100644 --- a/tests/regex_tests/username_test.py +++ b/tests/regex_tests/username_test.py @@ -29,14 +29,14 @@ class UsernameRegexTestCase(unittest.TestCase): for good in goodlist: try: self.assertIsNotNone(expression.match(good)) - except AssertionError as error: + except AssertionError: got_error = True print("Good string %s did not match expression" % good) for bad in badlist: try: self.assertIsNone(expression.match(bad)) - except AssertionError as error: + except AssertionError: got_error = True print("Bad string %s matched expression" % bad) @@ -70,7 +70,12 @@ class UsernameRegexTestCase(unittest.TestCase): 'g_burdell', '_burdell', 'gggggggggggggggggggggggggburdell', # 32 characters - 'ggggggggggggggggggggggggburdell$' + 'ggggggggggggggggggggggggburdell$', + '_', + 'r', + 'ro', + 'roo', + 'roota', ] bad_tests = [ @@ -83,7 +88,10 @@ class UsernameRegexTestCase(unittest.TestCase): 'ggggggggggggggggggggggggggburdell', # 33 characters 'gggggggggggggggggggggggggburdell$', ' gburdell', - ':gburdell' + ':gburdell', + 'root', + '$', + '-' ] self._run_tests(USERNAME_VALID, good_tests, bad_tests) -- 1.8.3.1

4 4

[master/rhel7-branch] Make it obvious user is going to begin installation in TUI. (#975793)
by Samantha N. Bueno 20 Sep '13

20 Sep '13

Re-post of a patch from forever ago that needed a little work. This should only require very minimal tweaking for rhel7-branch. This tweaks the global default prompt for the new option ('b' to begin installation), so it should now be very clear to users that they are about to kick off installation. This also adds a default prompt for spokes, as many of them need to have the 'c' to continue option, and it is probably best to just have 'b' to begin installation on the summary hub anyhow. End result looks like this: http://sbueno.fedorapeople.org/images/975793-revised.jpg Resolves: rhbz#975793 --- pyanaconda/ui/tui/hubs/__init__.py | 2 +- pyanaconda/ui/tui/simpleline/base.py | 6 +++--- pyanaconda/ui/tui/spokes/__init__.py | 10 ++++++++-- pyanaconda/ui/tui/spokes/network.py | 3 +++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pyanaconda/ui/tui/hubs/__init__.py b/pyanaconda/ui/tui/hubs/__init__.py index 8f219c3..be78b32 100644 --- a/pyanaconda/ui/tui/hubs/__init__.py +++ b/pyanaconda/ui/tui/hubs/__init__.py @@ -109,7 +109,7 @@ class TUIHub(TUIObject, common.Hub): # If we get a continue, check for unfinished spokes. If unfinished # don't continue # TRANSLATORS: 'c' to continue - if key == _('c'): + if key == _('b'): for spoke in self._spokes.values(): if not spoke.completed and spoke.mandatory: print(_("Please complete all spokes before continuing")) diff --git a/pyanaconda/ui/tui/simpleline/base.py b/pyanaconda/ui/tui/simpleline/base.py index 8c2424b..a02373f 100644 --- a/pyanaconda/ui/tui/simpleline/base.py +++ b/pyanaconda/ui/tui/simpleline/base.py @@ -455,8 +455,8 @@ class App(object): return True # global close command - # TRANSLATORS: 'c' to continue - if self._screens and (key == _('c')): + # TRANSLATORS: 'b' to begin installation + if self._screens and (key == _('b')): self.close_screen() return True @@ -582,7 +582,7 @@ class UIScreen(object): to skip further input processing :rtype: unicode|None """ - return _(u" Please make your choice from above ['q' to quit | 'c' to continue |\n 'r' to refresh]: ") + return _(u" Please make your choice from above ['q' to quit | 'b' to begin installation |\n 'r' to refresh]: ") @property def app(self): diff --git a/pyanaconda/ui/tui/spokes/__init__.py b/pyanaconda/ui/tui/spokes/__init__.py index 087199b..075af60 100644 --- a/pyanaconda/ui/tui/spokes/__init__.py +++ b/pyanaconda/ui/tui/spokes/__init__.py @@ -84,7 +84,8 @@ class TUISpoke(TUIObject, tui.Widget, Spoke): self.draw(c) class NormalTUISpoke(TUISpoke, NormalSpoke): - pass + def prompt(self, args=None): + return _(u" Please make your choice from above ['q' to quit | 'c' to continue] ") EditTUISpokeEntry = namedtuple("EditTUISpokeEntry", ["title", "attribute", "aux", "visible"]) @@ -266,7 +267,12 @@ class EditTUISpoke(NormalTUISpoke): self.apply() return True except ValueError: - pass + # Translators: 'c' to continue + if key.lower() == _("c"): + self.close() + return True + else: + pass return NormalTUISpoke.input(self, args, key) diff --git a/pyanaconda/ui/tui/spokes/network.py b/pyanaconda/ui/tui/spokes/network.py index a432bcb..0ada2a4 100644 --- a/pyanaconda/ui/tui/spokes/network.py +++ b/pyanaconda/ui/tui/spokes/network.py @@ -178,6 +178,9 @@ class NetworkSpoke(EditTUISpoke): try: num = int(key) except ValueError: + if key.lower() == _("c"): + self.close() + return INPUT_PROCESSED return key if num == 1: -- 1.7.11.7

3 6

[rhel6-branch][PATCH] Do not select FS packages over and over (#994504)
by Vratislav Podzimek 20 Sep '13

20 Sep '13

Instead of selecting FS packages for every device we can build a set of packages that should be selected for all devices and do it only once. This speeds up the installation on systems with many devices a lot. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- yuminstall.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yuminstall.py b/yuminstall.py index ef92d79..82923ae 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -1578,9 +1578,12 @@ debuglevel=6 selectKernel("kernel") def selectFSPackages(self, storage): + fspkgs = set() for device in storage.fsset.devices: # this takes care of device and filesystem packages - map(self.selectPackage, device.packages) + for pkg in device.packages: + fspkgs.add(pkg) + map(self.selectPackage, fspkgs) # anaconda requires several programs on the installed system to complete # installation, but we have no guarantees that some of these will be -- 1.7.11.7

2 1

[rhel6-branch] remove firmware files in ppc64 initrd
by David Cantrell 20 Sep '13

20 Sep '13

We hit the 32M limit again. Remove a list of firmware files that IBM has provided as non-applicable to ppc64. -- David Cantrell <dcantrell(a)redhat.com> Manager, Installer Engineering Team Red Hat, Inc. | Westford, MA | EST5EDT

2 2

[PATCH master] Use Sphinx documentation format in nm.py.
by Radek Vykydal 20 Sep '13

20 Sep '13

..as I promised --- pyanaconda/nm.py | 307 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 216 insertions(+), 91 deletions(-) diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py index 880c9df..3c587dc 100644 --- a/pyanaconda/nm.py +++ b/pyanaconda/nm.py @@ -104,7 +104,11 @@ def _get_property(object_path, prop, interface_name_suffix=""): return prop.unpack()[0] def nm_state(): - """Return state of NetworkManager""" + """Return state of NetworkManager + + :return: state of NetworkManager + :rtype: integer + """ return _get_property("/org/freedesktop/NetworkManager", "State") # FIXME - use just GLOBAL? There is some connectivity checking @@ -112,17 +116,29 @@ def nm_state(): # and how it is implemented. # Also see Gio g_network_monitor_can_reach. def nm_is_connected(): - """Is NetworkManager connected?""" + """Is NetworkManager connected? + + :return: True if NM is connected, False otherwise. + :rtype: bool + """ return nm_state() in (NetworkManager.State.CONNECTED_GLOBAL, NetworkManager.State.CONNECTED_SITE, NetworkManager.State.CONNECTED_LOCAL) def nm_is_connecting(): - """Is NetworkManager connecting?""" + """Is NetworkManager connecting? + + :return: True if NM is in CONNECTING state, False otherwise. + :rtype: bool + """ return nm_state() == NetworkManager.State.CONNECTING def nm_devices(): - """Return list of network device names supported in installer""" + """Return names of network devices supported in installer. + + :return: names of network devices supported in installer + :rtype: list of strings + """ interfaces = [] @@ -145,7 +161,11 @@ def nm_devices(): return interfaces def nm_activated_devices(): - """Return list of names of activated network devices""" + """Return names of activated network devices. + + :return: names of activated network devices + :rtype: list of strings + """ interfaces = [] @@ -185,9 +205,14 @@ def _device_type_specific_interface(device): def nm_device_property(name, prop): """Return value of device NM property - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if property is not found + :param name: name of device + :type name: str + :param prop: property + :type name: str + :return: value of device's property + :rtype: unpacked GDBus value + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if property is not found """ retval = None @@ -223,75 +248,100 @@ def nm_device_property(name, prop): def nm_device_type_is_wifi(name): """Is the type of device wifi? - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if type is not found + :param name: name of device + :type name: str + :return: True if type of device is WIFI, False otherwise + :rtype: bool + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if property is not found """ return nm_device_type(name) == NetworkManager.DeviceType.WIFI def nm_device_type_is_ethernet(name): """Is the type of device ethernet? - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if type is not found + :param name: name of device + :type name: str + :return: True if type of device is ETHERNET, False otherwise + :rtype: bool + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if property is not found """ return nm_device_type(name) == NetworkManager.DeviceType.ETHERNET def nm_device_type_is_bond(name): """Is the type of device bond? - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if type is not found + :param name: name of device + :type name: str + :return: True if type of device is BOND, False otherwise + :rtype: bool + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if property is not found """ return nm_device_type(name) == NetworkManager.DeviceType.BOND def nm_device_type_is_vlan(name): """Is the type of device vlan? - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if type is not found + :param name: name of device + :type name: str + :return: True if type of device is VLAN, False otherwise + :rtype: bool + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if property is not found """ return nm_device_type(name) == NetworkManager.DeviceType.VLAN def nm_device_hwaddress(name): - """Return device's 'HwAddress' property + """Return active hardware address of device ('HwAddress' property) - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if property is not found + :param name: name of device + :type name: str + :return: active hardware address of device ('HwAddress' property) + :rtype: str + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if 'HwAddress' property is not found """ return nm_device_property(name, "HwAddress") def nm_device_type(name): - """Return device's 'DeviceType' property + """Return device's type ('DeviceType' property). - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if property is not found + :param name: name of device + :type name: str + :return: device type + :rtype: integer + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if 'DeviceType' property is not found """ return nm_device_property(name, "DeviceType") def nm_device_carrier(name): - """Return device's 'Carrier' property + """Return whether physical carrier of device is found. + ('Carrier' property) - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if property is not found + :param name: name of device + :type name: str + :return: True if physical carrier is found, False otherwise + :rtype: bool + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if 'Carrier' property is not found """ return nm_device_property(name, "Carrier") def nm_device_ip_addresses(name, version=4): - """Return list of devices's IP addresses + """Return IP addresses of device in ACTIVATED state. - version=4 - ipv4 addresses - version=6 - ipv6 addresses - - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if ip configuration is not found + :param name: name of device + :type name: str + :param version: version of IP protocol (value 4 or 6) + :type version: int + :return: IP addresses of device, empty list if device is not + in ACTIVATED state + :rtype: list of strings + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if IP configuration is not found """ retval = [] config = nm_device_ip_config(name, version) @@ -303,8 +353,11 @@ def nm_device_ip_addresses(name, version=4): def nm_device_active_ssid(name): """Return ssid of device's active access point. - Exceptions: - UnknownDeviceError if device is not found + :param name: name of device + :type name: str + :return ssid of active access point, None if device has no active AP + :rtype: str + :raise UnknownDeviceError if device is not found """ try: @@ -321,25 +374,20 @@ def nm_device_active_ssid(name): return ssid def nm_device_ip_config(name, version=4): - """Return list of devices's IP config. + """Return IP configurations of device in ACTIVATED state. :param name: name of device :type name: str - :param version: version of IP protocol (value 4 or 6) :type version: int - - :returns: - - Returns: - [[[address1, prefix1, gateway1], [address2, prefix2, gateway2], ...], [nameserver1, nameserver2]] - addressX, gatewayX: string - prefixX: int - [] if device is not in ACTIVATED state - - Exceptions: - UnknownDeviceError if device is not found - PropertyNotFoundError if ip configuration is not found + :return: IP configuration of device, empty list if device is not + in ACTIVATED state + :rtype: [[[address1, prefix1, gateway1], [address2, prefix2, gateway2], ...], + [nameserver1, nameserver2]] + addressX, gatewayX: string + prefixX: int + :raise UnknownDeviceError if device is not found + :raise PropertyNotFoundError if ip configuration is not found """ state = nm_device_property(name, "State") if state != NetworkManager.DeviceState.ACTIVATED: @@ -393,10 +441,10 @@ def nm_device_ip_config(name, version=4): return [addr_list, ns_list] def nm_ntp_servers_from_dhcp(): - """Return a list of NTP servers that were specified the reply of the - DHCP server or empty list if no NTP servers were returned. - The return_hostnames parameter specifies if the NTP server IP - addresses from the DHCP reply should be converted to hostnames. + """Return NTP servers obtained by DHCP. + + return: NTP servers obtained by DHCP + rtype: list of str """ ntp_servers = [] # get paths for all actively connected interfaces @@ -419,12 +467,13 @@ def nm_ntp_servers_from_dhcp(): return ntp_servers def _device_settings(name): - """Return object path of device setting - - Returns None if settings were not found. + """Return object path of device setting. - Exceptions: - UnknownDeviceError - device was not found + :param name: name of device + :type name: str + :return: path of settings, None if not found + :rtype: str or None + :raise UnknownDeviceError if device is not found """ devtype = nm_device_type(name) if devtype == NetworkManager.DeviceType.BOND: @@ -444,7 +493,10 @@ def _device_settings(name): def _settings_for_ap(ssid): """Return object path of wireless access point settings. - Returns None if settings were not found. + :param ssid: ssid of access point + :type ssid: str + :return: path of settings, None if not found + :rtype: str or None ` """ return _find_settings(ssid, '802-11-wireless', 'ssid', format_value=lambda ba: "".join(chr(b) for b in ba)) @@ -452,7 +504,10 @@ def _settings_for_ap(ssid): def _settings_for_hwaddr(hwaddr): """Return object path of settings of device specified by hw address. - Returns None if settings were not found. + :param hwaddr: hardware address (uppercase) + :type hwaddr: str + :return: path of settings, None if not found + :rtype: str or None """ return _find_settings(hwaddr, '802-3-ethernet', 'mac-address', format_value=lambda ba: ":".join("%02X" % b for b in ba)) @@ -460,7 +515,17 @@ def _settings_for_hwaddr(hwaddr): def _find_settings(value, key1, key2, format_value=lambda x:x): """Return object path of settings having given value of key1, key2 setting - Returns None if settings were not found. + :param value: required value of setting + :type value: corresponds to dbus type of setting + :param key1: first-level key of setting (eg "connection") + :type key1: str + :param key2: second-level key of setting (eg "uuid") + :type key2: str + :param format_value: function to be called on setting value before + comparing + :type format_value: function taking one argument (setting value) + :return: path of settings, None if not found + :rtype: str or None """ retval = None @@ -495,16 +560,19 @@ def _find_settings(value, key1, key2, format_value=lambda x:x): def nm_device_setting_value(name, key1, key2): """Return value of device's setting specified by key1 and key2. - Return None if the setting is not found which means NM will use - default value for the setting. We can't validate that keys - actually correspond to a setting (see "connection" "autoconnect" - setting). - - Caller should handle None as default value. - - Exceptions: - UnknownDeviceError - device was not found - DeviceSettingsNotFoundError - settings were not found (eg for "wlan0") + :param name: name of device + :type name: str + :param key1: first-level key of setting (eg "connection") + :type key1: str + :param key2: second-level key of setting (eg "uuid") + :type key2: str + :return: value of setting or None if the setting was not found + which means it does not exist or default value is used + by NM + :rtype: unpacked GDBus variant or None + :raise UnknownDeviceError if device is not found + :raise DeviceSettingsNotFoundError if settings were not found + (eg for "wlan0") """ settings_path = _device_settings(name) if not settings_path: @@ -527,9 +595,13 @@ def nm_device_setting_value(name, key1, key2): def nm_activate_device_connection(dev_name, con_uuid): """Activate device with specified connection. - Exceptions: - UnknownDeviceError - device was not found - + :param dev_name: name of device + :type dev_name: str + :param con_uuid: uuid of connection to be activated on device + :type con_uuid: str + :raise UnknownDeviceError if device is not found + :raise UnmanagedDeviceError if device is not managed by NM + or unavailable """ proxy = _get_proxy() @@ -565,15 +637,29 @@ def nm_activate_device_connection(dev_name, con_uuid): def nm_update_settings_of_device(name, new_values): """Update setting of device. - new_values: list of settings to be modified [[key1, key2, value, default_type_str], ...] - The type of value is determined from existing settings of device. If setting for key1, key2 does not exist, default_type_str is used or if None, the type is inferred from the value supplied (string and bool only). - Exceptions: - UnknownDeviceError - device was not found - DeviceSettingsNotFoundError - settings were not found (eg for "wlan0") + :param name: name of device + :type name: str + :param new_values: list of settings with new values and its types + [[key1, key2, value, default_type_str]] + key1: first-level key of setting (eg "connection") + key2: second-level key of setting (eg "uuid") + value: new value + default_type_str: dbus type of new value to be used + if the setting does not already exist; + if None, the type is inferred from + value (string and bool only) + :type new_values: [[key1, key2, value, default_type_str], ...] + key1: str + key2: str + value: + default_type_str: str + :raise UnknownDeviceError if device is not found + :raise DeviceSettingsNotFoundError if settings were not found + (eg for "wlan0") """ settings_path = _device_settings(name) if not settings_path: @@ -583,11 +669,26 @@ def nm_update_settings_of_device(name, new_values): def _update_settings(settings_path, new_values): """Update setting of object specified by settings_path with value. - new_values: list of settings to be modified [[key1, key2, value, default_type_str], ...] - The type of value is determined from existing setting. If setting for key1, key2 does not exist, default_type_str is used or if None, the type is inferred from the value supplied (string and bool only). + + :param settings_path: path of settings object + :type settings_path: str + :param new_values: list of settings with new values and its types + [[key1, key2, value, default_type_str]] + key1: first-level key of setting (eg "connection") + key2: second-level key of setting (eg "uuid") + value: new value + default_type_str: dbus type of new value to be used + if the setting does not already exist; + if None, the type is inferred from + value (string and bool only) + :type new_values: [[key1, key2, value, default_type_str], ...] + key1: str + key2: str + value: + default_type_str: str """ proxy = _get_proxy(object_path=settings_path, interface_name="org.freedesktop.NetworkManager.Settings.Connection") args = None @@ -656,19 +757,43 @@ def _gvariant_settings(settings, updated_key1, updated_key2, value, default_type return GLib.Variant(settings.get_type_string(), (new_settings,)) def nm_ipv6_to_dbus_ay(address): - """Convert ipv6 address from string to list of bytes (ay) for dbus.""" + """Convert ipv6 address from string to list of bytes 'ay' for dbus + + :param address: IPv6 address + :type address: str + :return: address in format 'ay' for NM dbus setting + :rtype: list of bytes + """ return [int(byte, 16) for byte in re.findall('.{1,2}', IPy.IP(address).strFullsize().replace(':', ''))] def nm_ipv4_to_dbus_int(address): - """Convert ipv4 address from string to int for dbus (switched endianess).""" + """Convert ipv4 address from string to int for dbus (switched endianess). + + :param address: IPv4 address + :type address: str + :return: IPv4 address as an integer 'u' for NM dbus setting + :rtype: integer + """ return struct.unpack("=L", socket.inet_aton(address))[0] def nm_dbus_ay_to_ipv6(bytelist): - """Convert ipv6 address from list of bytes (dbus ay) to string.""" + """Convert ipv6 address from list of bytes (dbus 'ay') to string. + + :param address: IPv6 address as list of bytes returned by dbus ('ay') + :type address: list of bytes - dbus 'ay' + :return: IPv6 address + :rtype: str + """ return socket.inet_ntop(socket.AF_INET6, "".join(chr(byte) for byte in bytelist)) def nm_dbus_int_to_ipv4(address): - """Convert ipv4 address from int from dbus (switched endianess) to string.""" + """Convert ipv4 address from dus int 'u' (switched endianess) to string. + + :param address: IPv4 address as integer returned by dbus ('u') + :type address: integer - dbus 'u' + :return: IPv6 address + :rtype: str + """ return socket.inet_ntop(socket.AF_INET, struct.pack('=L', address)) def test(): -- 1.7.11.7

2 1

[master/rhel7] tui ErrorDialog needs to be modal (#983316)
by Brian C. Lane 20 Sep '13

20 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> The dialog waits for any key to be hit, and it needs to be displayed immediately so use a modal screen. --- pyanaconda/packaging/yumpayload.py | 3 ++- pyanaconda/ui/tui/__init__.py | 2 +- pyanaconda/ui/tui/tuiobject.py | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 5c9bbc1..d9630f9 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -1525,7 +1525,8 @@ reposdir=%s except DependencyError as e: if errorHandler.cb(e) == ERROR_RAISE: progressQ.send_quit(1) - sys.exit(1) + while True: + time.sleep(100000) # doPreInstall # create mountpoints for protected device mountpoints (?) diff --git a/pyanaconda/ui/tui/__init__.py b/pyanaconda/ui/tui/__init__.py index cb3e511..c3e8471 100644 --- a/pyanaconda/ui/tui/__init__.py +++ b/pyanaconda/ui/tui/__init__.py @@ -258,7 +258,7 @@ class TextUserInterface(ui.UserInterface): """Internal helper function that MUST BE CALLED FROM THE MAIN THREAD""" error_window = ErrorDialog(self._app, message) - self._app.switch_screen(error_window) + self._app.switch_screen_modal(error_window) def showDetailedError(self, message, details): return self._show_message_in_main_thread(self._showDetailedError, (message, details)) diff --git a/pyanaconda/ui/tui/tuiobject.py b/pyanaconda/ui/tui/tuiobject.py index e2c96f7..da82909 100644 --- a/pyanaconda/ui/tui/tuiobject.py +++ b/pyanaconda/ui/tui/tuiobject.py @@ -44,6 +44,7 @@ class ErrorDialog(tui.UIScreen): tui.UIScreen.refresh(self, args) text = tui.TextWidget(self._message) self._window.append(tui.CenterWidget(text)) + return True def prompt(self, args = None): return _("Press enter to exit.") @@ -51,6 +52,7 @@ class ErrorDialog(tui.UIScreen): def input(self, args, key): """This dialog is closed by any input.""" self.close() + return None class YesNoDialog(tui.UIScreen): """Dialog screen for Yes - No questions.""" -- 1.8.3.1

2 1

[PATCH] Set the password strength color based on strength (#965596)
by David Shea 20 Sep '13

20 Sep '13

Define styles for GtkLevelBar widgets at the named levels "low", "medium" and "high". Define value offsets for these names in each of the GtkLevelBar widgets we use. --- data/Makefile.am | 8 ++-- data/anaconda-gtk.css | 62 ++++++++++++++++++++++++++++++ pyanaconda/ui/gui/__init__.py | 6 +++ pyanaconda/ui/gui/spokes/lib/passphrase.py | 3 ++ pyanaconda/ui/gui/spokes/password.py | 5 +++ pyanaconda/ui/gui/spokes/user.py | 5 +++ scripts/makeupdates | 2 + 7 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 data/anaconda-gtk.css diff --git a/data/Makefile.am b/data/Makefile.am index 2f66b00..1c08ed2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,10 +21,8 @@ SUBDIRS = command-stubs icons liveinst pixmaps systemd post-scripts CLEANFILES = *~ -ksdir = $(datadir)/$(PACKAGE_NAME) -dist_ks_DATA = interactive-defaults.ks - -tmuxdir = $(datadir)/$(PACKAGE_NAME) -dist_tmux_DATA = tmux.conf +dist_pkgdata_DATA = interactive-defaults.ks \ + tmux.conf \ + anaconda-gtk.css MAINTAINERCLEANFILES = Makefile.in diff --git a/data/anaconda-gtk.css b/data/anaconda-gtk.css new file mode 100644 index 0000000..92669ba --- /dev/null +++ b/data/anaconda-gtk.css @@ -0,0 +1,62 @@ +/* Define styles to apply to the GtkLevelBar widgets for different values. + * + * This stylesheet defines properties for "low", "medium" and "high" level bar + * levels. The level bars themselves need to define what style applies at what + * value using gtk_level_bar_add_offset_value. Gtk defines "low" and "high" by + * default, but it defines them for level bars using a continuous value between + * 0 and 1, so our discrete level bars are effectively always at the "high" + * level. + * + * Fun surprises that might change in future versions: + * + * - Defining properties for a level will set properties on both the filled + * portion and the empty portion of the level bar. So if all of the display + * properties are set, which we do, the level bar effectively becomes 100% + * filled with whatever properties are set. Copying the .empty-fill-block + * properties from the theme so that they apply at the application level + * works around this. + * + * - There's a bug in the handling of the maximum offset in that it only + * applies when value == max-value, rather than when it's between + * max-value and the next lower offset. For example, consider a + * discrete-mode level bar with a max-value of 4 and offsets defined as + * "low": 2.0, "medium": 3.0 and "high": 4.0. Value 1 will be low, + * value 2 will be medium, value 3 will be in an undefined no-man's land, + * and value 4 will be high. To get around this we re-define the default + * fill-block values as the same as fill-block.level-high. + * + * - The GNOME Adwaita theme applies a gradient to the progress bar when the + * window is focused. It does this by redefining the colors in a + * background-image property, so unless we reset background-image our colors + * will only apply when the window is out of focus, which uses the :backdrop + * selector. + */ + +@define-color anaconda_level_bar_low red; +@define-color anaconda_level_bar_medium orange; +@define-color anaconda_level_bar_high green; + +.level-bar.fill-block.level-low { + border-color: darker(@anaconda_level_bar_low); + background-color: @anaconda_level_bar_low; + background-image: none; +} + +.level-bar.fill-block.level-medium { + border-color: darker(@anaconda_level_bar_medium); + background-color: @anaconda_level_bar_medium; + background-image: none; +} + +.level-bar.fill-block, +.level-bar.fill-block.level-high { + border-color: darker(@anaconda_level_bar_high); + background-color: @anaconda_level_bar_high; + background-image: none; +} + +.level-bar.fill-block.empty-fill-block { + background-color: transparent; + background-image: none; + border-color: alpha(#000000, 0.1); +} diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index 7f18c4b..22270b3 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -624,6 +624,12 @@ class GraphicalUserInterface(UserInterface): settings.set_property("gtk-font-name", "Cantarell") settings.set_property("gtk-icon-theme-name", "gnome") + # Apply the application stylesheet + provider = Gtk.CssProvider() + provider.load_from_path("/usr/share/anaconda/anaconda-gtk.css") + Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, + Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) + self._currentAction.window.show_all() # Do this at the last possible minute. diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py index 9c77c18..2cd6887 100644 --- a/pyanaconda/ui/gui/spokes/lib/passphrase.py +++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py @@ -71,6 +71,9 @@ class PassphraseDialog(GUIObject): self._strength_bar.set_mode(Gtk.LevelBarMode.DISCRETE) self._strength_bar.set_min_value(0) self._strength_bar.set_max_value(4) + self._strength_bar.add_offset_value("low", 2) + self._strength_bar.add_offset_value("medium", 3) + self._strength_bar.add_offset_value("high", 4) box = self.builder.get_object("strength_box") box.pack_start(self._strength_bar, False, True, 0) box.show_all() diff --git a/pyanaconda/ui/gui/spokes/password.py b/pyanaconda/ui/gui/spokes/password.py index 55bf116..b828317 100644 --- a/pyanaconda/ui/gui/spokes/password.py +++ b/pyanaconda/ui/gui/spokes/password.py @@ -62,6 +62,11 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke): self.pw_bar = self.builder.get_object("password_bar") self.pw_label = self.builder.get_object("password_label") + # Configure levels for the password bar + self.pw_bar.add_offset_value("low", 2) + self.pw_bar.add_offset_value("medium", 3) + self.pw_bar.add_offset_value("high", 4) + def refresh(self): self.pw.grab_focus() self._checkPassword() diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py index 1ee9399..a6fe7a0 100644 --- a/pyanaconda/ui/gui/spokes/user.py +++ b/pyanaconda/ui/gui/spokes/user.py @@ -259,6 +259,11 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke): self.pw_bar = self.builder.get_object("password_bar") self.pw_label = self.builder.get_object("password_label") + # Configure levels for the password bar + self.pw_bar.add_offset_value("low", 2) + self.pw_bar.add_offset_value("medium", 3) + self.pw_bar.add_offset_value("high", 4) + # indicate when the password was set by kickstart self._user.password_kickstarted = self.data.user.seen if self._user.password_kickstarted: diff --git a/scripts/makeupdates b/scripts/makeupdates index b49cac6..72b0245 100755 --- a/scripts/makeupdates +++ b/scripts/makeupdates @@ -259,6 +259,8 @@ def copyUpdatedFiles(tag, updates, cwd): install_to_dir(file, "lib/systemd/system-generators") elif file == "data/tmux.conf": install_to_dir(file, "usr/share/anaconda") + elif file == "data/anaconda-gtk.css": + install_to_dir(file, "usr/share/anaconda") elif file == "data/interactive-defaults.ks": install_to_dir(file, "usr/share/anaconda") elif file == "data/liveinst/liveinst": -- 1.8.3.1

2 1

[PATCH] ProgressHub no longer exists in pyanaconda/ui/tui/hubs.
by Chris Lumens 20 Sep '13

20 Sep '13

--- pyanaconda/ui/tui/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyanaconda/ui/tui/__init__.py b/pyanaconda/ui/tui/__init__.py index 31bcff5..f97b0fb 100644 --- a/pyanaconda/ui/tui/__init__.py +++ b/pyanaconda/ui/tui/__init__.py @@ -27,7 +27,6 @@ from pyanaconda.flags import flags from pyanaconda.threads import threadMgr import simpleline as tui from hubs.summary import SummaryHub -from hubs.progress import ProgressHub from spokes import StandaloneSpoke from tuiobject import YesNoDialog, ErrorDialog @@ -126,7 +125,7 @@ class TextUserInterface(ui.UserInterface): def _list_hubs(self): """returns the list of hubs to use""" - return [SummaryHub, ProgressHub] + return [SummaryHub] def _is_standalone(self, spoke): """checks if the passed spoke is standalone""" -- 1.8.1.2

4 6

[master][PATCH] Keyboard variant names may contain dashes (#1008730)
by Vratislav Podzimek 20 Sep '13

20 Sep '13

Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/keyboard.py | 2 +- tests/pyanaconda_tests/keyboard_test.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py index 03d988a..e86771a 100644 --- a/pyanaconda/keyboard.py +++ b/pyanaconda/keyboard.py @@ -61,7 +61,7 @@ LOCALED_IFACE = "org.freedesktop.locale1" # should match and parse strings like 'cz' or 'cz (qwerty)' regardless of white # space LAYOUT_VARIANT_RE = re.compile(r'^\s*(\w+)\s*' # layout plus - r'(?:(?:$\s*(\w+)\s*$)' # variant in parentheses + r'(?:(?:$\s*([-\w]+)\s*$)' # variant in parentheses r'|(?:$))\s*') # or nothing # namedtuple for information about a keyboard layout (its language and description) diff --git a/tests/pyanaconda_tests/keyboard_test.py b/tests/pyanaconda_tests/keyboard_test.py index ca8aa38..1b8974d 100644 --- a/tests/pyanaconda_tests/keyboard_test.py +++ b/tests/pyanaconda_tests/keyboard_test.py @@ -25,11 +25,15 @@ class ParsingAndJoiningTests(unittest.TestCase): def layout_variant_parsing_test(self): """Should correctly parse keyboard layout and variant string specs.""" - # a valid layout variant spec + # valid layout variant specs 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)") + 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") self.assertEqual(layout, "cz") -- 1.7.11.7

2 2

[PATCH] Fix the password confirmation match check
by David Shea 20 Sep '13

20 Sep '13

The check for whether the password field and the password confirmation field match is run when either field is changed, since changes to either field will cause the state of the match to change. This was working correctly when a change to either field broke the match, but was not always working when a change fixed the match. The check object for the field not changed remained in a failure state, making it impossible to exit the spoke even though the password matched. This fixes that by manually running the check on the field not changed. --- pyanaconda/ui/gui/__init__.py | 11 +++++++++-- pyanaconda/ui/gui/spokes/user.py | 33 ++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index 7f18c4b..f971794 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -98,9 +98,16 @@ class GUICheck(object): self._handler_id = None self._check_status = None - def update_check_status(self, editable=None, data=None): + def update_check_status(self, editable=None, check_data=None): """Run an input validation check.""" - new_check_status = self._run_check(self._editable, self._check_data) + + # Allow check parameters to be overriden in parameters + if editable is None: + editable = self._editable + if check_data is None: + check_data = self._check_data + + new_check_status = self._run_check(editable, check_data) check_status_changed = (self._check_status != new_check_status) self._check_status = new_check_status diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py index 1ee9399..dd2d217 100644 --- a/pyanaconda/ui/gui/spokes/user.py +++ b/pyanaconda/ui/gui/spokes/user.py @@ -279,9 +279,13 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke): self.add_check(self.pw, self._checkPasswordEmpty, None) # The password confirmation needs to be checked whenever either of the password - # fields change - self.add_check(self.confirm, self._checkPasswordConfirm, None) - self.add_check(self.pw, self._checkPasswordConfirm, None) + # fields change. Separate checks are created on each field so that edits on + # either will trigger a check and so that the last edited field will get the focus + # when Done is clicked. Whichever check is run needs to run the other check in + # order to reset the status. The check_data field is used as a flag to prevent + # infinite recursion. + self._confirm_check = self.add_check(self.confirm, self._checkPasswordConfirm, None) + self._password_check = self.add_check(self.pw, self._checkPasswordConfirm, None) # Keep a reference to this check, since it has to be manually run for the # click Done twice check. @@ -483,16 +487,31 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke): else: return None - def _checkPasswordConfirm(self, editable=None, data=None): + def _checkPasswordConfirm(self, editable=None, reset_status=None): """If the user has entered confirmation data, check whether it matches the password.""" + + # This check is triggered by changes to either the password field or the + # confirmation field. If this method is being run from a successful check + # to reset the status, just return success + if reset_status: + return None # Skip the check if no password is required if (not self.usepassword.get_active()) or self._user.password_kickstarted: - return None + result = None elif self.confirm.get_text() and (self.pw.get_text() != self.confirm.get_text()): - return _("The passwords do not match.") + result = _("The passwords do not match.") else: - return None + result = None + + # If the check succeeded, reset the status of the other check object + if result is None: + if editable == self.confirm: + self._password_check.update_check_status(check_data=True) + else: + self._confirm_check.update_check_status(check_data=True) + + return result def _checkPasswordStrength(self, editable=None, data=None): """Update the error message based on password strength. -- 1.8.3.1

2 1

[PATCH rhel6-branch] fcoe: adapt bnx2fc detection to changed sysfs path structure (#1008731)
by Radek Vykydal 19 Sep '13

19 Sep '13

Slightly modified patch by Eddie Wai. --- storage/udev.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/storage/udev.py b/storage/udev.py index e6455c8..78fb996 100644 --- a/storage/udev.py +++ b/storage/udev.py @@ -616,7 +616,7 @@ def udev_device_get_iscsi_initiator(info): # This is completely different for Broadcom FCoE devices (bnx2fc), where we use # the sysfs path: -# /devices/pci0000:00/0000:00:02.0/0000:09:00.0/0000:0a:01.0/0000:0e:00.0/host3/rport-3:0-2/target3:0:1/3:0:1:3/block/sdm +# /devices/pci0000:00/0000:00:03.0/0000:04:00.3/net/eth3/ctlr_0/host5/rport-5:0-3/target5:0:1/5:0:1:147/block/sdb # and find whether the host has 'fc_host' and if it the device has a bound # Ethernet interface. @@ -626,7 +626,7 @@ def _detect_broadcom_fcoe(info): if match: sysfs_pci, host = match.groups() if os.access('/sys/%s/%s/fc_host' %(sysfs_pci, host), os.X_OK) and \ - os.access('/sys/%s/net' %(sysfs_pci), os.X_OK): + 'net' in sysfs_pci: return (sysfs_pci, host) return (None, None) @@ -662,10 +662,14 @@ def udev_device_get_fcoe_nic(info): (sysfs_pci, host) = _detect_broadcom_fcoe(info) if (sysfs_pci, host) != (None, None): - net_path = '/sys/%s/net' % sysfs_pci - listdir = os.listdir(net_path) - if len(listdir) > 0 : - return listdir[0] + net, iface = info['sysfs_path'].split("/")[5:7] + if net != "net": + log.warning("unexpected sysfs_path of bnx2fc device: %s" % info['sysfs_path']) + match = re.compile(r'.*/net/([^/]*)').match(info['sysfs_path']) + if match: + return match.groups()[0] + else: + return iface def udev_device_get_fcoe_identifier(info): path = info.get("ID_PATH", "") -- 1.7.11.7

2 1

[PATCH] Behave better when PYTHONPATH is already set
by David Shea 18 Sep '13

18 Sep '13

Append to $PYTHONPATH rather than replacing it. Use $top_srcdir rather than $PYTHONPATH to detect whether automake has already set up the test environment. --- tests/nosetests.sh | 9 +++------ tests/pylint/runpylint.sh | 10 +++++----- tests/testenv.sh | 8 ++++++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tests/nosetests.sh b/tests/nosetests.sh index 1ad86c0..e0b1c1e 100755 --- a/tests/nosetests.sh +++ b/tests/nosetests.sh @@ -1,11 +1,8 @@ #!/bin/sh -# Use the directory above the one containing the script as the default for -# $top_srcdir -: "${top_srcdir:=$(dirname "$0")/..}" - -# If no PYTHONPATH is set, import the test environment -if [ -z "$PYTHONPATH" ]; then +# If $top_srcdir has not been set by automake, import the test environment +if [ -z "$top_srcdir" ]; then + top_srcdir="$(dirname "$0")/.." . ${top_srcdir}/tests/testenv.sh fi diff --git a/tests/pylint/runpylint.sh b/tests/pylint/runpylint.sh index 6fe1b6c..af4183e 100755 --- a/tests/pylint/runpylint.sh +++ b/tests/pylint/runpylint.sh @@ -15,14 +15,14 @@ if [ -z "$top_srcdir" ]; then pylint_log=1 fi -: "${top_srcdir:=$(dirname "$0")/../..}" -srcdir="${top_srcdir}/tests/pylint" - -# If no PYTHONPATH is set, import the test environment -if [ -z "$PYTHONPATH" ]; then +# If $top_srcdir has not been set by automake, import the test environment +if [ -z "$top_srcdir" ]; then + top_srcdir="$(dirname "$0")/../.." . ${top_srcdir}/tests/testenv.sh fi +srcdir="${top_srcdir}/tests/pylint" + FALSE_POSITIVES="${srcdir}"/pylint-false-positives # W0212 - Access to a protected member %s of a client class diff --git a/tests/testenv.sh b/tests/testenv.sh index b4749b4..1568644 100644 --- a/tests/testenv.sh +++ b/tests/testenv.sh @@ -5,10 +5,14 @@ if [ -z "$top_srcdir" ]; then exit 1 fi -# If not top_builddir is set, use top_srcdir +# If no top_builddir is set, use top_srcdir : "${top_builddir:=$top_srcdir}" -PYTHONPATH="${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}" +if [ -z "$PYTHONPATH" ]; then + PYTHONPATH="${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}" +else + PYTHONPATH="${PYTHONPATH}:${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}" +fi export PYTHONPATH export top_srcdir export top_builddir -- 1.8.3.1

2 1

[PATCH] Check the validity of generated usernames in TUI (#965543)
by David Shea 18 Sep '13

18 Sep '13

--- pyanaconda/ui/tui/spokes/user.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/tui/spokes/user.py b/pyanaconda/ui/tui/spokes/user.py index 6185f80..6ece776 100644 --- a/pyanaconda/ui/tui/spokes/user.py +++ b/pyanaconda/ui/tui/spokes/user.py @@ -108,7 +108,9 @@ class UserSpoke(FirstbootSpokeMixIn, EditTUISpoke): def apply(self): if self.args.gecos and not self.args.name: - self.args.name = guess_username(self.args.gecos) + username = guess_username(self.args.gecos) + if USERNAME_VALID.match(username): + self.args.name = guess_username(self.args.gecos) self.args.groups = [g.strip() for g in self.args._groups.split(",") if g] -- 1.8.3.1

2 1

[PATCH] Filter out devices with no media from custom (#960794)
by Brian C. Lane 18 Sep '13

18 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> --- pyanaconda/ui/gui/spokes/custom.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 97391b5..2d784d1 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -781,7 +781,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): @property def unusedDevices(self): unused_devices = [d for d in self.__storage.unusedDevices - if d.disks and not d.partitioned and d.isleaf] + if d.disks and d.mediaPresent and + not d.partitioned and d.isleaf] # add incomplete VGs and MDs incomplete = [d for d in self.__storage.devicetree._devices if not getattr(d, "complete", True)] -- 1.8.3.1

2 1

[rhel6-branch] check size of ppc64.img
by David Cantrell 18 Sep '13

18 Sep '13

Check the size of ppc64.img in addition to initrd.img to see if it's greater than 32M. This script is a minefield, so anything that looks redundant or extra, I prefer to not change. Related to 1006043. Another patch coming to reduce the size of ppc64.img once feedback is received from IBM Australia. -- David Cantrell <dcantrell(a)redhat.com> Manager, Installer Engineering Team Red Hat, Inc. | Westford, MA | EST5EDT

2 2

[PATCH] Decode keyboard layout descriptions as UTF-8 (#1009278)
by David Shea 18 Sep '13

18 Sep '13

--- pyanaconda/keyboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py index c51a4d4..03d988a 100644 --- a/pyanaconda/keyboard.py +++ b/pyanaconda/keyboard.py @@ -550,7 +550,7 @@ class XklWrapper(object): # layout-variant description xlated_lang = iso_(layout_info.lang) return "%s (%s)" % (iutil.upcase_first_letter(xlated_lang.decode("utf-8")), - Xkb_(layout_info.desc)) + Xkb_(layout_info.desc).decode("utf-8")) else: return layout_info.desc -- 1.8.3.1

2 1

[PATCH] anaconda-dracut: fix ks failure with hd:<dev>:some/path.ks
by Will Woods 18 Sep '13

18 Sep '13

When we try to grab the kickstart from disk, $tmpmnt will be something like /run/install/tmpmnt1, and $path is the user-provided bit after the second ':'. If your path doesn't start with a / (say "myks.cfg"), we'd mount $dev then do "cp /run/install/tmpmnt1myks.cfg /tmp/ks.cfg". Which fails. Make sure there's a slash separating the path and the filename. Duh. --- dracut/fetch-kickstart-disk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut/fetch-kickstart-disk b/dracut/fetch-kickstart-disk index 3172049..d9ead33 100755 --- a/dracut/fetch-kickstart-disk +++ b/dracut/fetch-kickstart-disk @@ -18,7 +18,7 @@ if [ -n "$mnt" ]; then else tmpmnt="$(mkuniqdir /run/install tmpmnt)" if mount -o ro $dev $tmpmnt; then - cp $tmpmnt$path /tmp/ks.cfg + cp $tmpmnt/$path /tmp/ks.cfg umount $tmpmnt rmdir $tmpmnt fi -- 1.8.3.1

2 2

[PATCH] Add metalink support to yumpayload
by Brian C. Lane 18 Sep '13

18 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> Fedora has started using metalink in the default repo config. This expands into a giant baseurl list. Anaconda was picking the first entry and writing that to the repo config. This checks for metalink and if present writes that instead, allowing mirror fallback to work. --- pyanaconda/packaging/yumpayload.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 6d7cb05..58c7a13 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -276,10 +276,12 @@ reposdir=%s f.write("enabled=1\n") if repo.mirrorlist: f.write("mirrorlist=%s" % repo.mirrorlist) + elif repo.metalink: + f.write("metalink=%s" % repo.metalink) elif repo.baseurl: f.write("baseurl=%s\n" % repo.baseurl[0]) else: - log.error("repo %s has no baseurl or mirrorlist", repo.id) + log.error("repo %s has no baseurl, mirrorlist or metalink", repo.id) f.close() os.unlink(cfg_path) continue -- 1.8.3.1

2 1

[master] Mirror the GUI if RTL language is chosen
by Vratislav Podzimek 18 Sep '13

18 Sep '13

For some languages (or more precisely scripts) the GUI should be mirrored to reflect the reading direction. Gtk handles that automatically, but... (see the patches). Once Gtk provides a function to get default widget direction for current language configuration [1], we will get rid of the hacky parts. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1008821 Vratislav Podzimek (2): Mirror the GUI if an RTL language is chosen (#1008397) Render the right arrow based on the widget direction (#1008397) data/pixmaps/left-arrow-icon.png | Bin 0 -> 286 bytes .../ui/gui/spokes/lib/lang_locale_handler.py | 9 ++++--- pyanaconda/ui/gui/spokes/welcome.py | 5 +++- pyanaconda/ui/gui/utils.py | 29 +++++++++++++++++++++ widgets/src/MountpointSelector.c | 15 ++++++++++- 5 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 data/pixmaps/left-arrow-icon.png -- 1.7.11.7

2 5

[lorax] [patch] tag fatal error as error
by J_Groves＠DELL.com 18 Sep '13

18 Sep '13

Greetings, I'm new to pungi/lorax, but this suggestion addresses confusion for us in a complex build. To pungi, we pass a -ver <splat>. <splat> got too long, and lorax complained "the volume id cannot be longer than 32 characters" Due to other cruft in our build log that included variants of the word "error", we didn't immediately realize this log entry was important. The following patch would address that confusion. (this is the only call to logger.fatal that I find in lorax) Best regards, John Groves --- diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index 37829da..e0ce0e0 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -230,7 +230,7 @@ class Lorax(BaseLoraxClass): self.arch) if len(isolabel) > 32: - logger.fatal("the volume id cannot be longer than 32 characters") + logger.fatal("ERROR: the volume id cannot be longer than 32 characters") sys.exit(1) templatedir = self.conf.get("lorax", "sharedir")

2 1

[PATCH] git commit check for ack flag on rhel branches
by Brian C. Lane 18 Sep '13

18 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> --- scripts/githooks/commit-msg | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/scripts/githooks/commit-msg b/scripts/githooks/commit-msg index a360dbb..aa3a93e 100755 --- a/scripts/githooks/commit-msg +++ b/scripts/githooks/commit-msg @@ -15,18 +15,20 @@ # This example catches duplicate Signed-off-by lines. test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 } # Make sure commits on RHEL branches reference RHEL bugs. RETVAL=0 -git branch | grep ^* | cut -c3- | grep -q ^rhel -if [ $? -eq 1 ]; then +branch_name=$(git branch | grep ^* | cut -c3-) +branch_pattern="^rhel([[:digit:]])-branch" +if [[ ! "$branch_name" =~ $branch_pattern ]]; then exit ${RETVAL} fi +RELEASE=${BASH_REMATCH[1]} if [ -f "${HOME}/.rhbzauth" ]; then . "${HOME}/.rhbzauth" @@ -51,6 +53,16 @@ else ${bzcmd} login fi +bz_has_ack() { + bug=$1 + flags=$(${bzcmd} query --bug_id=${bug} --outputformat="%{flags}") + + ack_pattern="rhel-${RELEASE}\.[[:digit:]]+\.[[:digit:]]+\+" + if [[ ! "$flags" =~ $ack_pattern ]]; then + echo "*** BZ ${bug} is missing acks: ${flags}" + fi +} + summary="$(head -n 1 ${1})" for word in ${summary} ; do echo "${word}" | grep -q -E "^.*(#[0-9]+).*" @@ -61,6 +73,7 @@ for word in ${summary} ; do echo "*** BZ ${bug} is not a RHEL bug." >&2 RETVAL=1 fi + bz_has_ack ${bug} fi done @@ -75,6 +88,7 @@ if [ ${last} -gt 0 ]; then echo "*** BZ ${bug} is not a RHEL bug." >&2 RETVAL=1 fi + bz_has_ack ${bug} done fi -- 1.8.3.1

2 3

[rhel7-branch/master][PATCH] Search all disk types for install media (#1004726)
by David Shea 17 Sep '13

17 Sep '13

This way we allow USB-based install media as an installation source. --- pyanaconda/image.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pyanaconda/image.py b/pyanaconda/image.py index b3604ff..2c58488 100644 --- a/pyanaconda/image.py +++ b/pyanaconda/image.py @@ -189,7 +189,11 @@ def mountImage(isodir, tree): def opticalInstallMedia(devicetree, mountpoint=INSTALL_TREE): retval = None - for dev in devicetree.getDevicesByType("cdrom"): + # Search for devices identified as cdrom along with any other + # device that has an iso9660 filesystem. This will catch USB media + # created from ISO images. + for dev in set(devicetree.getDevicesByType("cdrom") + \ + [d for d in devicetree.devices if d.format.type == "iso9660"]): devicetree.updateDeviceFormat(dev) if not hasattr(dev.format, "mount"): # no mountable media -- 1.8.3.1

2 1

[master] Two ways how to fix the #1008788 blocker
by Vratislav Podzimek 17 Sep '13

17 Sep '13

My commit 5634449a1645343f3be340aa39faebdd5436ab35 causes that the TUI ProgressHub is not scheduled/run because it provides no spokes and the result is that the actual installation is skipped, because it is triggered by the hub. There are two ways how to fix this issue: 1. always schedule the TUI ProgressHub 2. make ProgressHub a standalone spoke I'm for 2. because the ProgressHub really is not a hub. It outputs a lot of text to the standard output and thus it cannot provide any spokes as those would be rolled off soon after the installation begins. However, 1. is much shorter and probably less invasive. -- 1.7.11.7

3 7

livecd-iso-to-disk label patch
by Helio Chissini de Castro 17 Sep '13

17 Sep '13

Here's a small patch to handle a feature introduced on anaconda. Anaconda options inst.ks allows to create a inst.ks:LABEL=<SOME> to pass custom kickstart files, and more specific, if you want create an grub menu with multiple kickstarts, it allows you to do inst.ks:LABEL=<SOME>:/custom.cfg This patch allows to override the fixed LIVE label if you want some custom name. It fix the regexp that befores glob the entire line after LABEL=, and then overriding all entries that comes after : ex.: Original isolinux.cfg inst.ks:LABEL=SOME:/media/myks.cfg With current tool after subst: inst.ks:LABEL=LIVE After the patch inst.ks:LABEL=<SOME>:/media/myks.cfg Thanks in advance

2 1

[PATCH pylorax] livemedia-creator: add file system manifest creation option for --make-iso builds
by Joey Boggs 17 Sep '13

17 Sep '13

This add a fine level of details about the created image including: - installed packages - source rpms used - licensing - dependencies - where disk space is used Signed-off-by: Joey Boggs <jboggs(a)redhat.com> --- src/pylorax/treebuilder.py | 84 ++++++++++++++++++++++++++++++++++++++++++++++ src/sbin/livemedia-creator | 6 ++++ 2 files changed, 90 insertions(+) diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 2e7c43e..0311118 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -29,6 +29,7 @@ from base import DataHolder from ltmpl import LoraxTemplateRunner import imgutils from pylorax.executils import runcmd, runcmd_output +from subprocess import Popen, PIPE, STDOUT templatemap = { 'i386': 'x86.tmpl', @@ -184,6 +185,88 @@ class TreeBuilder(object): def kernels(self): return findkernels(root=self.vars.inroot) + def collect_manifest(self, cmd, output_file, sort=False): + output = runcmd_output(cmd, root=self.vars.inroot) + with open(os.path.join(self.manifest_path, output_file), "w") as f: + if sort: + output = output.split("\n") + for line in sorted(set(output),key=str.lower): + if line: + f.write("%s\n" % line) + else: + f.write(output) + + def create_manifests(self): + self.manifest_path = os.path.join(self.vars.outroot, "isolinux") + env = os.environ.copy() + env['LC_ALL'] = 'C' + os.makedirs(self.manifest_path) + # collect installed packages information + cmd = ["rpm", "-qa", "--qf", + "%{name}-%{version}-%{release}.%{arch} (%{SIGPGP:pgpsig})\n"] + self.collect_manifest(cmd, "manifest-rpm.txt", True) + + # collect source rpms + cmd = ["rpm", "-qa", "--qf", "%{sourcerpm}\n"] + self.collect_manifest(cmd, "manifest-srpm.txt", True) + + # collect all included licenses rhbz#601927 + cmd = ["rpm", "-qa", "--qf", "%{license}\n"] + self.collect_manifest(cmd, "manifest-license.txt", True) + + # get individial file sizes + cmd = ["du", "-akx", "--exclude=/var/cache/yum", "/"] + self.collect_manifest(cmd, "manifest-file.txt", True) + + # get directory sizes + cmd = ["du", "-x", "--exclude=/var/cache/yum", "/"] + self.collect_manifest(cmd, "manifest-dir.txt", True) + + # find orphaned files + file_list = [] + cmd = ["rpm", "-qa"] + installed_rpms = runcmd_output(cmd).strip() + + for pkg in installed_rpms.split("\n"): + cmd = ["rpm", "-ql", pkg] + pkg_files = runcmd_output(cmd).strip() + for f in pkg_files.split("\n"): + file_list.append("%s##%s" % (f, pkg)) + + cmd = ["find", "/", "-xdev"] + fs_list = runcmd_output(cmd).strip() + + for f in fs_list.split("\n"): + file_list.append("%s##Not owned by any package." % f) + + final_list = {} + + for item in file_list: + f, owner = item.split("##") + if not f in final_list: + final_list[f] = owner + + output_file = os.path.join(self.manifest_path, "manifest-owns.txt") + with open(output_file, "w") as t: + for x in final_list.keys(): + t.write("%s\n%s\n" % (x, final_list[x])) + + # get dependency list + cmd = ["rpm", "-qa"] + output = runcmd_output(cmd, root=self.vars.inroot) + piped_cmd = ["xargs", "-n1", "rpm", "-e", "--test"] + run_cmd = Popen(piped_cmd, stdout=PIPE, stdin=PIPE, stderr=PIPE) + stdout_data = run_cmd.communicate(input=output)[1] + deps_file = os.path.join(self.manifest_path, "manifest-deps.txt") + with open(deps_file, "w") as f: + f.write("%s\n" % stdout_data) + + # bzip large manufest files + for f in ["deps", "owns", "file", "dir" ]: + path = os.path.join(self.manifest_path, "manifest-%s.txt" % f) + cmd = ["bzip2", path] + runcmd(cmd) + def rebuild_initrds(self, add_args=[], backup="", prefix=""): '''Rebuild all the initrds in the tree. If backup is specified, each initrd will be renamed with backup as a suffix before rebuilding. @@ -269,6 +352,7 @@ def findkernels(root="/", kdir="boot"): r"(\.(?P<flavor>{0}))?)$".format("|".join(flavors))) kernels = [] bootfiles = os.listdir(joinpaths(root, kdir)) + for f in bootfiles: match = kre.match(f) if match: diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index 9239445..61c4a5e 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -535,6 +535,9 @@ def make_livecd(opts, mount_dir, work_dir): log.info("dracut args = {0}".format(dracut_args)) tb.rebuild_initrds(add_args=dracut_args) log.info("Building boot.iso") + log.info("Generating Manifests") + if opts.create_manifests and opts.make_iso: + tb.create_manifests() tb.build() return work_dir @@ -814,6 +817,9 @@ if __name__ == '__main__': parser.add_argument( "--volid", default=None, help="volume id") parser.add_argument( "--squashfs_args", help="additional squashfs args" ) + parser.add_argument( "--create-manifests", action="store_true", + help="Create file system manifests of image", + default=False ) opts = parser.parse_args() -- 1.8.3.1

2 2

[PATCH] Fix Lightbox for compositing window managers (#1008446)
by David Shea 17 Sep '13

17 Sep '13

If the lightbox is running in a compositing window manager, use Gtk to set the color and opacity of the widget. Fallback to drawing the background ourselves if we are not composited. --- widgets/src/Lightbox.c | 126 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 86 insertions(+), 40 deletions(-) diff --git a/widgets/src/Lightbox.c b/widgets/src/Lightbox.c index 245deab..c399cca 100644 --- a/widgets/src/Lightbox.c +++ b/widgets/src/Lightbox.c @@ -33,6 +33,24 @@ * The lightbox window will show as soon as it is created. */ +/* + * We have two methods for drawing the transparent background, depending + * on whether we can use a compositing window manager for alpha blending + * or not. + * + * In a compositing window manager (e.g., gnome-shell on the livecd), we + * create the transparent background using Gtk by overriding the window's + * background color and setting an opacity. + * + * In a non-compositing window manager (e.g., metacity on the install DVD), + * we override Gtk's drawing of the widget entirely. We set paintable to + * false to indicate that theme information should not be applied, and then + * as the parent-window property is being set, we use cairo to paint a new + * surface using the parent's Gdk window as the source pattern, apply a 50% + * translucent fill to the surface, and then use this surface as the + * background for the lightbox's Gdk window. + */ + #include <cairo.h> #include <gtk/gtk.h> @@ -48,10 +66,12 @@ struct _AnacondaLightboxPrivate { GtkWindow *transient_parent; gboolean parent_configure_event_handler_set; guint parent_configure_event_handler; + + gboolean composited; }; static void anaconda_lightbox_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); -static void anaconda_lightbox_draw_background(GObject *gobject, GParamSpec *psec, gpointer user_data); +static void anaconda_lightbox_set_parent_window(GObject *gobject, GParamSpec *psec, gpointer user_data); static gboolean anaconda_lb_parent_configure_event(GtkWidget *parent, GdkEvent *event, gpointer lightbox); static gboolean anaconda_lb_configure_event(GtkWidget *lightbox, GdkEvent *event, gpointer user_data); @@ -96,10 +116,32 @@ static void anaconda_lightbox_init(AnacondaLightbox *lightbox) gtk_window_set_decorated(GTK_WINDOW(lightbox), FALSE); gtk_window_set_has_resize_grip(GTK_WINDOW(lightbox), FALSE); - /* Indicate we will handle drawing the widget so no theme is applied */ - gtk_widget_set_app_paintable(GTK_WIDGET(lightbox), TRUE); gtk_window_set_type_hint(GTK_WINDOW(lightbox), GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); + /* Decide now which background drawing method to use */ + lightbox->priv->composited = gtk_widget_is_composited(GTK_WIDGET(lightbox)); + if (lightbox->priv->composited) + { + GdkRGBA color = {0.0, 0.0, 0.0, 1.0}; /* opaque black */ + + /* Set the background to black */ + gtk_widget_override_background_color(GTK_WIDGET(lightbox), + GTK_STATE_FLAG_NORMAL, + &color + ); + + /* Set the opacity to 50% */ + gtk_widget_set_opacity(GTK_WIDGET(lightbox), 0.5); + } + else + { + /* + * Indicate we will handle drawing the widget, do the rest in + * anaconda_lightbox_set_parent_window + */ + gtk_widget_set_app_paintable(GTK_WIDGET(lightbox), TRUE); + } + /* handle restacking events */ g_signal_connect(lightbox, "configure-event", G_CALLBACK(anaconda_lb_configure_event), NULL); @@ -117,7 +159,7 @@ static void anaconda_lightbox_set_property(GObject *object, guint prop_id, const case PROP_PARENT_WINDOW: priv->transient_parent = GTK_WINDOW(g_object_ref(g_value_get_object(value))); /* The property is CONSTRUCT_ONLY, so no point calling notify */ - anaconda_lightbox_draw_background(object, pspec, NULL); + anaconda_lightbox_set_parent_window(object, pspec, NULL); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -181,7 +223,7 @@ static gboolean anaconda_lb_parent_configure_event( * Draw the window background. Uses the gobject notify handler signature * in case we want to allow parent-window to change in the future. */ -static void anaconda_lightbox_draw_background( +static void anaconda_lightbox_set_parent_window( GObject *gobject, GParamSpec *psec, gpointer user_data @@ -232,43 +274,47 @@ static void anaconda_lightbox_draw_background( G_CALLBACK(anaconda_lb_parent_configure_event), lightbox); lightbox->priv->parent_configure_event_handler_set = TRUE; - /* - * NB: We should probably be handling the draw signal in order to refresh - * the transparent pattern from the parent window whenver something - * changes, but by the time things get to the signal handler the surface is - * already set up and doesn't support alpha channels and replacing it - * doesn't seem to work quite right. Besides, none of these windows are - * supposed to move anyway. - */ - - /* Realize the window to initialize the Gdk objects */ - if (!gtk_widget_get_realized(GTK_WIDGET(lightbox))) + /* Handle the non-compositing background case */ + if (!lightbox->priv->composited) { - gtk_widget_realize(GTK_WIDGET(lightbox)); + /* + * NB: We should probably be handling the draw signal in order to refresh + * the transparent pattern from the parent window whenver something + * changes, but by the time things get to the signal handler the surface is + * already set up and doesn't support alpha channels and replacing it + * doesn't seem to work quite right. Besides, none of these windows are + * supposed to move anyway. + */ + + /* Realize the window to initialize the Gdk objects */ + if (!gtk_widget_get_realized(GTK_WIDGET(lightbox))) + { + gtk_widget_realize(GTK_WIDGET(lightbox)); + } + g_lightbox_window = gtk_widget_get_window(GTK_WIDGET(lightbox)); + + /* Create a new surface that supports alpha content */ + surface = gdk_window_create_similar_surface(g_lightbox_window, + CAIRO_CONTENT_COLOR_ALPHA, + gdk_window_get_width(g_parent_window), + gdk_window_get_height(g_parent_window)); + cr = cairo_create(surface); + + /* Use the parent window as a pattern and paint it on the surface */ + gdk_cairo_set_source_window(cr, g_parent_window, 0, 0); + cairo_paint(cr); + + /* Paint a black, 50% transparent shade */ + cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.5); + cairo_paint(cr); + + cairo_destroy(cr); + + /* Use the surface we painted as the window background */ + pattern = cairo_pattern_create_for_surface(surface); + gdk_window_set_background_pattern(g_lightbox_window, pattern); + cairo_pattern_destroy(pattern); } - g_lightbox_window = gtk_widget_get_window(GTK_WIDGET(lightbox)); - - /* Create a new surface that supports alpha content */ - surface = gdk_window_create_similar_surface(g_lightbox_window, - CAIRO_CONTENT_COLOR_ALPHA, - gdk_window_get_width(g_parent_window), - gdk_window_get_height(g_parent_window)); - cr = cairo_create(surface); - - /* Use the parent window as a pattern and paint it on the surface */ - gdk_cairo_set_source_window(cr, g_parent_window, 0, 0); - cairo_paint(cr); - - /* Paint a black, 50% transparent shade */ - cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.5); - cairo_paint(cr); - - cairo_destroy(cr); - - /* Use the surface we painted as the window background */ - pattern = cairo_pattern_create_for_surface(surface); - gdk_window_set_background_pattern(g_lightbox_window, pattern); - cairo_pattern_destroy(pattern); } gtk_widget_show(GTK_WIDGET(lightbox)); -- 1.8.3.1

2 1

[lorax-rhel7 1/2] livemedia-creator: Fix gcdx64.efi path to work for other distros than Fedora (#1003078)
by Brian C. Lane 16 Sep '13

16 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> --- share/live/x86.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/live/x86.tmpl b/share/live/x86.tmpl index 8d31b8b..a640fee 100644 --- a/share/live/x86.tmpl +++ b/share/live/x86.tmpl @@ -49,7 +49,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} ## WHeeeeeeee, EFI. ## We could remove the basearch restriction someday.. <% efiargs=""; efigraft=""; efihybrid="" %> -%if exists("boot/efi/EFI/fedora/gcdx64.efi") and basearch != 'i386': +%if exists("boot/efi/EFI/*/gcdx64.efi") and basearch != 'i386': <% efiarch = 'X64' if basearch=='x86_64' else 'IA32' efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) -- 1.8.3.1

2 2

[lorax-rhel7] livemedia-creator: Update example kickstart for rhel7 (#922064)
by Brian C. Lane 16 Sep '13

16 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> Based on fedora live kickstart. Removes the ec2 example because RHEL7 doesn't include cloud-init and I have no way to test the results. --- docs/fedora-livemedia-ec2.ks | 120 ------------- docs/fedora-livemedia.ks | 390 ------------------------------------------- docs/rhel7-livemedia.ks | 376 +++++++++++++++++++++++++++++++++++++++++ lorax.spec | 1 + 4 files changed, 377 insertions(+), 510 deletions(-) delete mode 100644 docs/fedora-livemedia-ec2.ks delete mode 100644 docs/fedora-livemedia.ks create mode 100644 docs/rhel7-livemedia.ks diff --git a/docs/fedora-livemedia-ec2.ks b/docs/fedora-livemedia-ec2.ks deleted file mode 100644 index 79ec1bc..0000000 --- a/docs/fedora-livemedia-ec2.ks +++ /dev/null @@ -1,120 +0,0 @@ -# Build a basic Fedora AMI using livemedia-creator -lang en_US.UTF-8 -keyboard us -timezone --utc America/New_York -auth --useshadow --enablemd5 -selinux --enforcing -firewall --service=ssh -bootloader --location=none -network --bootproto=dhcp --device=eth0 --onboot=on --activate -services --enabled=network,sshd,rsyslog -shutdown - -# By default the root password is emptied -rootpw --plaintext removethispw - -# -# Define how large you want your rootfs to be -# NOTE: S3-backed AMIs have a limit of 10G -# -zerombr -clearpart --all -part / --size 10000 --fstype ext4 --ondisk sda -part biosboot --size=1 -part swap --size=512 - -# -# Repositories -url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/19/x86_64/os/" - -# -# -# Add all the packages after the base packages -# -%packages --nobase -@core -system-config-securitylevel-tui -audit -pciutils -bash -coreutils -kernel - -e2fsprogs -passwd -policycoreutils -chkconfig -rootfiles -yum -vim-minimal -acpid -openssh-clients -openssh-server -curl -sudo - -#Allow for dhcp access -dhclient -iputils - --firstboot --biosdevname - -# package to setup cloudy bits for us -cloud-init - -grub --dracut-config-rescue -%end - -# more ec2-ify -%post --erroronfail - -# create ec2-user -/usr/sbin/useradd ec2-user -/bin/echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers - -# fstab mounting is different for x86_64 and i386 -cat <<EOL > /etc/fstab -/dev/xvda1 / ext4 defaults 1 1 -/dev/xvda2 /mnt ext3 defaults 0 0 -/dev/xvda3 swap swap defaults 0 0 -EOL - -if [ ! -d /lib64 ] ; then -# workaround xen performance issue (bz 651861) -echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf -fi - -# Install grub.conf -# idle=nomwait is to allow xen images to boot and not try use cpu features that are not supported -INITRD=`ls /boot/initramfs-* | head -n1` -KERNEL=`ls /boot/vmlinuz-* | head -n1` -mkdir /boot/grub -pushd /boot/grub -cat <<EOL > grub.conf -default 0 -timeout 0 - -title Fedora Linux - root (hd0) - kernel $KERNEL root=/dev/xvda1 idle=halt - initrd $INITRD -EOL -# symlink grub.conf to menu.lst for use by EC2 pv-grub -ln -s grub.conf menu.lst -popd - -# the firewall rules get saved as .old without this we end up not being able -# ssh in as iptables blocks access -rename -v .old "" /etc/sysconfig/*old - -# setup systemd to boot to the right runlevel -rm /etc/systemd/system/default.target -ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target - -# remove the root password -passwd -d root > /dev/null - -%end - diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks deleted file mode 100644 index 6d59a22..0000000 --- a/docs/fedora-livemedia.ks +++ /dev/null @@ -1,390 +0,0 @@ -#version=DEVEL -sshpw --username=root --plaintext randOmStrinGhERE -# Firewall configuration -firewall --enabled --service=mdns -# Use network installation -url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/19/x86_64/os/" - -# X Window System configuration information -xconfig --startxonboot -# Root password -rootpw --plaintext removethispw -# Network information -network --bootproto=dhcp --device=eth0 --onboot=on --activate -# System authorization information -auth --useshadow --enablemd5 -# System keyboard -keyboard us -# System language -lang en_US.UTF-8 -# SELinux configuration -selinux --enforcing -# Installation logging level -logging --level=info -# Shutdown after installation -shutdown -# System services -services --disabled="network,sshd" --enabled="NetworkManager" -# System timezone -timezone US/Eastern -# System bootloader configuration -bootloader --location=mbr -# Clear the Master Boot Record -zerombr -# Partition clearing information -clearpart --all -# Disk partitioning information -part biosboot --size=1 -part / --fstype="ext4" --size=4000 -part swap --size=1000 - -%post -# FIXME: it'd be better to get this installed from a package -cat > /etc/rc.d/init.d/livesys << EOF -#!/bin/bash -# -# live: Init script for live image -# -# chkconfig: 345 00 99 -# description: Init script for live image. - -. /etc/init.d/functions - -if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then - exit 0 -fi - -if [ -e /.liveimg-configured ] ; then - configdone=1 -fi - -exists() { - which \$1 >/dev/null 2>&1 || return - \$* -} - -touch /.liveimg-configured - -# mount live image -if [ -b \`readlink -f /dev/live\` ]; then - mkdir -p /mnt/live - mount -o ro /dev/live /mnt/live 2>/dev/null || mount /dev/live /mnt/live -fi - -livedir="LiveOS" -for arg in \`cat /proc/cmdline\` ; do - if [ "\${arg##live_dir=}" != "\${arg}" ]; then - livedir=\${arg##live_dir=} - return - fi -done - -# enable swaps unless requested otherwise -swaps=\`blkid -t TYPE=swap -o device\` -if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then - for s in \$swaps ; do - action "Enabling swap partition \$s" swapon \$s - done -fi -if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /mnt/live/\${livedir}/swap.img ] ; then - action "Enabling swap file" swapon /mnt/live/\${livedir}/swap.img -fi - -mountPersistentHome() { - # support label/uuid - if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then - homedev=\`/sbin/blkid -o device -t "\$homedev"\` - fi - - # if we're given a file rather than a blockdev, loopback it - if [ "\${homedev##mtd}" != "\${homedev}" ]; then - # mtd devs don't have a block device but get magic-mounted with -t jffs2 - mountopts="-t jffs2" - elif [ ! -b "\$homedev" ]; then - loopdev=\`losetup -f\` - if [ "\${homedev##/mnt/live}" != "\${homedev}" ]; then - action "Remounting live store r/w" mount -o remount,rw /mnt/live - fi - losetup \$loopdev \$homedev - homedev=\$loopdev - fi - - # if it's encrypted, we need to unlock it - if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then - echo - echo "Setting up encrypted /home device" - plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome" - homedev=/dev/mapper/EncHome - fi - - # and finally do the mount - mount \$mountopts \$homedev /home - # if we have /home under what's passed for persistent home, then - # we should make that the real /home. useful for mtd device on olpc - if [ -d /home/home ]; then mount --bind /home/home /home ; fi - [ -x /sbin/restorecon ] && /sbin/restorecon /home - if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi -} - -findPersistentHome() { - for arg in \`cat /proc/cmdline\` ; do - if [ "\${arg##persistenthome=}" != "\${arg}" ]; then - homedev=\${arg##persistenthome=} - return - fi - done -} - -if strstr "\`cat /proc/cmdline\`" persistenthome= ; then - findPersistentHome -elif [ -e /mnt/live/\${livedir}/home.img ]; then - homedev=/mnt/live/\${livedir}/home.img -fi - -# if we have a persistent /home, then we want to go ahead and mount it -if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then - action "Mounting persistent /home" mountPersistentHome -fi - -# make it so that we don't do writing to the overlay for things which -# are just tmpdirs/caches -mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum -mount -t tmpfs tmp /tmp -mount -t tmpfs vartmp /var/tmp -[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /tmp /var/tmp >/dev/null 2>&1 - -if [ -n "\$configdone" ]; then - exit 0 -fi - -# add fedora user with no passwd -action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser -passwd -d liveuser > /dev/null - -# turn off firstboot for livecd boots -chkconfig --level 345 firstboot off 2>/dev/null -# We made firstboot a native systemd service, so it can no longer be turned -# off with chkconfig. It should be possible to turn it off with systemctl, but -# that doesn't work right either. For now, this is good enough: the firstboot -# service will start up, but this tells it not to run firstboot. I suspect the -# other services 'disabled' below are not actually getting disabled properly, -# with systemd, but we can look into that later. - AdamW 2010/08 F14Alpha -echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot - -# don't start yum-updatesd for livecd boots -chkconfig --level 345 yum-updatesd off 2>/dev/null - -# turn off mdmonitor by default -chkconfig --level 345 mdmonitor off 2>/dev/null - -# turn off setroubleshoot on the live image to preserve resources -chkconfig --level 345 setroubleshoot off 2>/dev/null - -# don't do packagekit checking by default -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/update-icon/frequency_get_updates never >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/update-icon/frequency_get_upgrades never >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/update-icon/frequency_refresh_cache never >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/update-icon/notify_available false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/update-icon/notify_distro_upgrades false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_firmware false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_hardware false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_codec_helper false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_font_helper false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_mime_type_helper false >/dev/null - - -# don't start cron/at as they tend to spawn things which are -# disk intensive that are painful on a live image -chkconfig --level 345 crond off 2>/dev/null -chkconfig --level 345 atd off 2>/dev/null -chkconfig --level 345 anacron off 2>/dev/null -chkconfig --level 345 readahead_early off 2>/dev/null -chkconfig --level 345 readahead_later off 2>/dev/null - -# Stopgap fix for RH #217966; should be fixed in HAL instead -touch /media/.hal-mtab - -# workaround clock syncing on shutdown that we don't want (#297421) -sed -i -e 's/hwclock/no-such-hwclock/g' /etc/rc.d/init.d/halt - -# and hack so that we eject the cd on shutdown if we're using a CD... -if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then - cat >> /sbin/halt.local << FOE -#!/bin/bash -# XXX: This often gets stuck during shutdown because /etc/init.d/halt -# (or something else still running) wants to read files from the block\ -# device that was ejected. Disable for now. Bug #531924 -# we want to eject the cd on halt, but let's also try to avoid -# io errors due to not being able to get files... -#cat /sbin/halt > /dev/null -#cat /sbin/reboot > /dev/null -#/usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1 -#echo "Please remove the CD from your drive and press Enter to finish restarting" -#read -t 30 < /dev/console -FOE -chmod +x /sbin/halt.local -fi - -EOF - -# bah, hal starts way too late -cat > /etc/rc.d/init.d/livesys-late << EOF -#!/bin/bash -# -# live: Late init script for live image -# -# chkconfig: 345 99 01 -# description: Late init script for live image. - -. /etc/init.d/functions - -if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then - exit 0 -fi - -exists() { - which \$1 >/dev/null 2>&1 || return - \$* -} - -touch /.liveimg-late-configured - -# read some variables out of /proc/cmdline -for o in \`cat /proc/cmdline\` ; do - case \$o in - ks=*) - ks="--kickstart=\${o#ks=}" - ;; - xdriver=*) - xdriver="\${o#xdriver=}" - ;; - esac -done - -# if liveinst or textinst is given, start anaconda -if strstr "\`cat /proc/cmdline\`" liveinst ; then - plymouth --quit - /usr/sbin/liveinst \$ks -fi -if strstr "\`cat /proc/cmdline\`" textinst ; then - plymouth --quit - /usr/sbin/liveinst --text \$ks -fi - -# configure X, allowing user to override xdriver -if [ -n "\$xdriver" ]; then - cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE -Section "Device" - Identifier "Videocard0" - Driver "\$xdriver" -EndSection -FOE -fi - -EOF - -chmod 755 /etc/rc.d/init.d/livesys -/sbin/restorecon /etc/rc.d/init.d/livesys -/sbin/chkconfig --add livesys - -chmod 755 /etc/rc.d/init.d/livesys-late -/sbin/restorecon /etc/rc.d/init.d/livesys-late -/sbin/chkconfig --add livesys-late - -# work around for poor key import UI in PackageKit -rm -f /var/lib/rpm/__db* -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora -echo "Packages within this LiveCD" -rpm -qa - -# go ahead and pre-make the man -k cache (#455968) -/usr/bin/mandb - -# make sure there aren't core files lying around -rm -f /core* - -# convince readahead not to collect -rm -f /.readahead_collect -touch /var/lib/readahead/early.sorted - -%end - -%post --nochroot -cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL - -# only works on x86, x86_64 -if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then - if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi - cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS -fi -%end - -%post -cat >> /etc/rc.d/init.d/livesys << EOF -# disable screensaver locking -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/gnome/lockdown/disable_lock_screen true >/dev/null - -# set up timed auto-login for after 60 seconds -cat >> /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Show harddisk install on the desktop -sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop -chown -R liveuser.liveuser /home/liveuser/Desktop -chmod a+x /home/liveuser/Desktop/liveinst.desktop - -# But not trash and home -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/trash_icon_visible false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/home_icon_visible false >/dev/null - -# Turn off PackageKit-command-not-found while uninstalled -sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf - -# Use the animated laughlin background by default -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -t str -s /desktop/gnome/background/picture_filename /usr/share/backgrounds/laughlin/default-tod/laughlin.xml - -EOF - -# Remove root password -passwd -d root > /dev/null - -# fstab from the install won't match anything. remove it and let dracut -# handle mounting. -cat /dev/null > /etc/fstab - -%end - -%packages -@admin-tools -@standard -@base-x -@core -@dial-up -@fonts -@gnome-desktop -@graphical-internet -@hardware-support -@input-methods -#@office -#@printing -#@sound-and-video -anaconda -isomd5sum -kernel -laughlin-backgrounds-animated-gnome -memtest86+ -nss-mdns --ibus-pinyin-db-open-phrase --smartmontools -grub2-efi -grub2 -shim -syslinux --dracut-config-rescue -%end diff --git a/docs/rhel7-livemedia.ks b/docs/rhel7-livemedia.ks new file mode 100644 index 0000000..13b97e1 --- /dev/null +++ b/docs/rhel7-livemedia.ks @@ -0,0 +1,376 @@ +#version=DEVEL +sshpw --username=root --plaintext randOmStrinGhERE +# Firewall configuration +firewall --enabled --service=mdns +# Use network installation +url --url=http://repo/rhel7.0/Server/os +repo --name=optional --baseurl=http://repo/rhel7.0/Server/optional/os + +# X Window System configuration information +xconfig --startxonboot +# Root password +rootpw --plaintext removethispw +# Network information +network --bootproto=dhcp --onboot=on --activate +# System authorization information +auth --useshadow --enablemd5 +# System keyboard +keyboard us +# System language +lang en_US.UTF-8 +# SELinux configuration +selinux --enforcing +# Installation logging level +logging --level=info +# Shutdown after installation +shutdown +# System services +services --disabled="network,sshd" --enabled="NetworkManager" +# System timezone +timezone US/Eastern +# System bootloader configuration +bootloader --location=mbr +# Clear the Master Boot Record +zerombr +# Partition clearing information +clearpart --all +# Disk partitioning information +part biosboot --size=1 +part / --fstype="ext4" --size=4000 +part swap --size=1000 + +%post +# FIXME: it'd be better to get this installed from a package +cat > /etc/rc.d/init.d/livesys << EOF +#!/bin/bash +# +# live: Init script for live image +# +# chkconfig: 345 00 99 +# description: Init script for live image. + +. /etc/init.d/functions + +if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then + exit 0 +fi + +if [ -e /.liveimg-configured ] ; then + configdone=1 +fi + +exists() { + which \$1 >/dev/null 2>&1 || return + \$* +} + +touch /.liveimg-configured + +# mount live image +if [ -b \`readlink -f /dev/live\` ]; then + mkdir -p /mnt/live + mount -o ro /dev/live /mnt/live 2>/dev/null || mount /dev/live /mnt/live +fi + +livedir="LiveOS" +for arg in \`cat /proc/cmdline\` ; do + if [ "\${arg##live_dir=}" != "\${arg}" ]; then + livedir=\${arg##live_dir=} + return + fi +done + +# enable swaps unless requested otherwise +swaps=\`blkid -t TYPE=swap -o device\` +if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then + for s in \$swaps ; do + action "Enabling swap partition \$s" swapon \$s + done +fi +if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /mnt/live/\${livedir}/swap.img ] ; then + action "Enabling swap file" swapon /mnt/live/\${livedir}/swap.img +fi + +mountPersistentHome() { + # support label/uuid + if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then + homedev=\`/sbin/blkid -o device -t "\$homedev"\` + fi + + # if we're given a file rather than a blockdev, loopback it + if [ "\${homedev##mtd}" != "\${homedev}" ]; then + # mtd devs don't have a block device but get magic-mounted with -t jffs2 + mountopts="-t jffs2" + elif [ ! -b "\$homedev" ]; then + loopdev=\`losetup -f\` + if [ "\${homedev##/mnt/live}" != "\${homedev}" ]; then + action "Remounting live store r/w" mount -o remount,rw /mnt/live + fi + losetup \$loopdev \$homedev + homedev=\$loopdev + fi + + # if it's encrypted, we need to unlock it + if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then + echo + echo "Setting up encrypted /home device" + plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome" + homedev=/dev/mapper/EncHome + fi + + # and finally do the mount + mount \$mountopts \$homedev /home + # if we have /home under what's passed for persistent home, then + # we should make that the real /home. useful for mtd device on olpc + if [ -d /home/home ]; then mount --bind /home/home /home ; fi + [ -x /sbin/restorecon ] && /sbin/restorecon /home + if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi +} + +findPersistentHome() { + for arg in \`cat /proc/cmdline\` ; do + if [ "\${arg##persistenthome=}" != "\${arg}" ]; then + homedev=\${arg##persistenthome=} + return + fi + done +} + +if strstr "\`cat /proc/cmdline\`" persistenthome= ; then + findPersistentHome +elif [ -e /mnt/live/\${livedir}/home.img ]; then + homedev=/mnt/live/\${livedir}/home.img +fi + +# if we have a persistent /home, then we want to go ahead and mount it +if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then + action "Mounting persistent /home" mountPersistentHome +fi + +# make it so that we don't do writing to the overlay for things which +# are just tmpdirs/caches +mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum +mount -t tmpfs tmp /tmp +mount -t tmpfs vartmp /var/tmp +[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /tmp /var/tmp >/dev/null 2>&1 + +if [ -n "\$configdone" ]; then + exit 0 +fi + +# add fedora user with no passwd +action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser +passwd -d liveuser > /dev/null + +# turn off firstboot for livecd boots +chkconfig --level 345 firstboot off 2>/dev/null +# We made firstboot a native systemd service, so it can no longer be turned +# off with chkconfig. It should be possible to turn it off with systemctl, but +# that doesn't work right either. For now, this is good enough: the firstboot +# service will start up, but this tells it not to run firstboot. I suspect the +# other services 'disabled' below are not actually getting disabled properly, +# with systemd, but we can look into that later. - AdamW 2010/08 F14Alpha +echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot + +# don't start yum-updatesd for livecd boots +chkconfig --level 345 yum-updatesd off 2>/dev/null + +# turn off mdmonitor by default +chkconfig --level 345 mdmonitor off 2>/dev/null + +# turn off setroubleshoot on the live image to preserve resources +chkconfig --level 345 setroubleshoot off 2>/dev/null + +# don't do packagekit checking by default +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/update-icon/frequency_get_updates never >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/update-icon/frequency_get_upgrades never >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/update-icon/frequency_refresh_cache never >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/update-icon/notify_available false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/update-icon/notify_distro_upgrades false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_firmware false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_hardware false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_codec_helper false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_font_helper false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_mime_type_helper false >/dev/null + + +# don't start cron/at as they tend to spawn things which are +# disk intensive that are painful on a live image +chkconfig --level 345 crond off 2>/dev/null +chkconfig --level 345 atd off 2>/dev/null +chkconfig --level 345 anacron off 2>/dev/null +chkconfig --level 345 readahead_early off 2>/dev/null +chkconfig --level 345 readahead_later off 2>/dev/null + +# Stopgap fix for RH #217966; should be fixed in HAL instead +touch /media/.hal-mtab + +# workaround clock syncing on shutdown that we don't want (#297421) +sed -i -e 's/hwclock/no-such-hwclock/g' /etc/rc.d/init.d/halt + +# and hack so that we eject the cd on shutdown if we're using a CD... +if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then + cat >> /sbin/halt.local << FOE +#!/bin/bash +# XXX: This often gets stuck during shutdown because /etc/init.d/halt +# (or something else still running) wants to read files from the block\ +# device that was ejected. Disable for now. Bug #531924 +# we want to eject the cd on halt, but let's also try to avoid +# io errors due to not being able to get files... +#cat /sbin/halt > /dev/null +#cat /sbin/reboot > /dev/null +#/usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1 +#echo "Please remove the CD from your drive and press Enter to finish restarting" +#read -t 30 < /dev/console +FOE +chmod +x /sbin/halt.local +fi + +EOF + +# bah, hal starts way too late +cat > /etc/rc.d/init.d/livesys-late << EOF +#!/bin/bash +# +# live: Late init script for live image +# +# chkconfig: 345 99 01 +# description: Late init script for live image. + +. /etc/init.d/functions + +if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then + exit 0 +fi + +exists() { + which \$1 >/dev/null 2>&1 || return + \$* +} + +touch /.liveimg-late-configured + +# read some variables out of /proc/cmdline +for o in \`cat /proc/cmdline\` ; do + case \$o in + ks=*) + ks="--kickstart=\${o#ks=}" + ;; + xdriver=*) + xdriver="\${o#xdriver=}" + ;; + esac +done + +# if liveinst or textinst is given, start anaconda +if strstr "\`cat /proc/cmdline\`" liveinst ; then + plymouth --quit + /usr/sbin/liveinst \$ks +fi +if strstr "\`cat /proc/cmdline\`" textinst ; then + plymouth --quit + /usr/sbin/liveinst --text \$ks +fi + +# configure X, allowing user to override xdriver +if [ -n "\$xdriver" ]; then + cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE +Section "Device" + Identifier "Videocard0" + Driver "\$xdriver" +EndSection +FOE +fi + +EOF + +chmod 755 /etc/rc.d/init.d/livesys +/sbin/restorecon /etc/rc.d/init.d/livesys +/sbin/chkconfig --add livesys + +chmod 755 /etc/rc.d/init.d/livesys-late +/sbin/restorecon /etc/rc.d/init.d/livesys-late +/sbin/chkconfig --add livesys-late + +# work around for poor key import UI in PackageKit +rm -f /var/lib/rpm/__db* +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora +echo "Packages within this LiveCD" +rpm -qa + +# go ahead and pre-make the man -k cache (#455968) +/usr/bin/mandb + +# make sure there aren't core files lying around +rm -f /core* + +# convince readahead not to collect +rm -f /.readahead_collect +touch /var/lib/readahead/early.sorted + +%end + +%post --nochroot +cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL + +# only works on x86, x86_64 +if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then + if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi + cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS +fi +%end + +%post +cat >> /etc/rc.d/init.d/livesys << EOF +# disable screensaver locking +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/gnome/lockdown/disable_lock_screen true >/dev/null + +# set up timed auto-login for after 60 seconds +cat >> /etc/gdm/custom.conf << FOE +[daemon] +AutomaticLoginEnable=True +AutomaticLogin=liveuser +FOE + +# Show harddisk install on the desktop +sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop +mkdir /home/liveuser/Desktop +cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop +chown -R liveuser.liveuser /home/liveuser/Desktop +chmod a+x /home/liveuser/Desktop/liveinst.desktop + +# But not trash and home +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/trash_icon_visible false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/home_icon_visible false >/dev/null + +# Turn off PackageKit-command-not-found while uninstalled +sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf + +EOF + +# Remove root password +passwd -d root > /dev/null + +# fstab from the install won't match anything. remove it and let dracut +# handle mounting. +cat /dev/null > /etc/fstab + +%end + +%packages +@core +@fonts +@x11 +@gnome-desktop +@input-methods +anaconda +isomd5sum +kernel +memtest86+ +grub2-efi +grub2 +shim +syslinux +-dracut-config-rescue +%end diff --git a/lorax.spec b/lorax.spec index 049a412..363f953 100644 --- a/lorax.spec +++ b/lorax.spec @@ -73,6 +73,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %files %defattr(-,root,root,-) %doc COPYING AUTHORS README.livemedia-creator +%doc docs/rhel7-livemedia.ks %{python_sitelib}/pylorax %{python_sitelib}/*.egg-info %{_sbindir}/lorax -- 1.8.3.1

2 1

[master] Fix problems with translatable strings
by David Shea 16 Sep '13

16 Sep '13

Not every string is translatable, and some translatable strings require some extra information to make any damn sense to the translators. gettext is configured to include any comment that begins with TRANSLATORS: in the .pot file, so use that. In the bug fixed in patch #2 (854226), the translator is actually asking for gettext context strings, claiming that 'c' is being used as an input string for both "close" and "continue". It doesn't look like that's actually the case, or isn't anymore, but either way python still doesn't have pgettext support, so I just added some comments instead so that whoever gets asked to translate "c" gets a hint as to what that actually means. There is very likely more problems than just these.

2 7

[PATCH 1/2] Block resize slider value changed handler when setting range. (#1007387)
by David Lehman 16 Sep '13

16 Sep '13

--- pyanaconda/ui/gui/spokes/lib/resize.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyanaconda/ui/gui/spokes/lib/resize.py b/pyanaconda/ui/gui/spokes/lib/resize.py index f4b8e84..37c887e 100644 --- a/pyanaconda/ui/gui/spokes/lib/resize.py +++ b/pyanaconda/ui/gui/spokes/lib/resize.py @@ -225,7 +225,9 @@ class ResizeDialog(GUIObject): will not have a slider displayed, so they do not need to be worried with here. """ + self._resizeSlider.handler_block_by_func(self.on_resize_value_changed) self._resizeSlider.set_range(device.minSize, device.size) + self._resizeSlider.handler_unblock_by_func(self.on_resize_value_changed) self._resizeSlider.set_value(value) # The slider needs to be keyboard-accessible. We'll make small movements change in -- 1.8.1.4

2 2

[PATCH 0/2] Move all langs from geoip to top in Welcome spoke and fix default lang setting
by Martin Kolman 16 Sep '13

16 Sep '13

The first patch fixes how default language is set and also cleans up the default language setting code quite a bit. The second patch moves all languages found for the given territory reported by GeoIP to the top of the language list, above the separator, as suggested during the usability testing[1]. It also fixes locale variant preselection (so that for the GB territory, language is set to English, but locale to English(UK)). And finally the patch cleans-up the locale and language handling in Welcome spoke quite a bit. [1] https://fedoraproject.org/wiki/Anaconda/UX_Redesign/Usability_Test_Suggesti… Martin Kolman (2): Don't set ksdata.lang.seen to True if using default value Move all languages found by geoip to the top in Welcome spoke anaconda | 3 +- pyanaconda/kickstart.py | 5 --- pyanaconda/ui/gui/spokes/welcome.py | 70 +++++++++++++++++++++++++------------ 3 files changed, 49 insertions(+), 29 deletions(-) -- 1.8.3.1

3 7

[master][PATCH] Create the XklWrapper singleton in background
by Vratislav Podzimek 16 Sep '13

16 Sep '13

Creating the XklWrapper instance takes quite a lot of time (~4 seconds on a VM). Instead of doing when the first spoke needs it, we can create the instance in background as soon as the X server is started. Since it includes a lot of I/O operations, threading makes a real difference (at least 2 seconds on a VM). But the main advantage is that this long action happens before we show anything to user and not when some grey screen is shown. --- anaconda | 15 +++++++++++++++ pyanaconda/constants.py | 1 + pyanaconda/keyboard.py | 7 +++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/anaconda b/anaconda index 3e745e3..8b0dfc9 100755 --- a/anaconda +++ b/anaconda @@ -85,6 +85,19 @@ def startSpiceVDAgent(): else: log.info("Started spice-vdagent.") +def backgroundXklWrapperInitialize(): + """ + Create the XklWrapper singleton instance in a separate thread to save time + when it's really needed. + + """ + + from pyanaconda.constants import THREAD_XKL_WRAPPER_INIT + from pyanaconda.keyboard import XklWrapper + from pyanaconda.threads import threadMgr, AnacondaThread + + threadMgr.add(AnacondaThread(name=THREAD_XKL_WRAPPER_INIT, target=XklWrapper.get_instance)) + def startMetacityWM(): childpid = os.fork() if not childpid: @@ -144,6 +157,8 @@ def doExtraX11Actions(runres): startSpiceVDAgent() + backgroundXklWrapperInitialize() + def setupPythonUpdates(): from distutils.sysconfig import get_python_lib import gi.overrides diff --git a/pyanaconda/constants.py b/pyanaconda/constants.py index d4d8708..dfb9200 100644 --- a/pyanaconda/constants.py +++ b/pyanaconda/constants.py @@ -117,6 +117,7 @@ THREAD_ISCSI_LOGIN = "AnaIscsiLoginThread" THREAD_GEOLOCATION_REFRESH = "AnaGeolocationRefreshThread" THREAD_DATE_TIME = "AnaDateTimeThread" THREAD_TIME_INIT = "AnaTimeInitThread" +THREAD_XKL_WRAPPER_INIT = "AnaXklWrapperInitThread" # Geolocation constants diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py index e5b7793..cf3f5d8 100644 --- a/pyanaconda/keyboard.py +++ b/pyanaconda/keyboard.py @@ -38,6 +38,7 @@ import re import shutil import ctypes import gettext +import threading from collections import namedtuple @@ -363,11 +364,13 @@ class XklWrapper(object): """ _instance = None + _instance_lock = threading.Lock() @staticmethod def get_instance(): - if not XklWrapper._instance: - XklWrapper._instance = XklWrapper() + with XklWrapper._instance_lock: + if not XklWrapper._instance: + XklWrapper._instance = XklWrapper() return XklWrapper._instance -- 1.7.11.7

3 5

[PATCH] network: ifcfg files handling cleanup
by Radek Vykydal 16 Sep '13

16 Sep '13

The cleanup itself is in [1/7]. Then there are some patches fixing issues I came across while testing the patch (text mode, wifi, vlan, bonding, no link). And a bit more of tui improvement and code consolidation in [6/7].

3 11

[PATCH] Allow runpylint.sh to be passed files
by Brian C. Lane 13 Sep '13

13 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> --- tests/pylint/runpylint.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/pylint/runpylint.sh b/tests/pylint/runpylint.sh index 2cf5797..6fe1b6c 100755 --- a/tests/pylint/runpylint.sh +++ b/tests/pylint/runpylint.sh @@ -44,10 +44,11 @@ DISABLED_ERR_OPTIONS="--disable=E1103" DISABLED_WARN_OPTIONS="--disable=W0110,W0141,W0142,W0223,W0403,W0511,W0603,W0604,W0613,W0614" usage () { - echo "usage: `basename $0` [--strict] [--help]" + echo "usage: `basename $0` [--strict] [--help] [files...]" exit $1 } +FILES= while [ $# -gt 0 ]; do case $1 in --strict) @@ -57,8 +58,8 @@ while [ $# -gt 0 ]; do usage 0 ;; *) - echo "Error unknown option: $1" - usage 1 + FILES=$@ + break esac shift done @@ -76,7 +77,10 @@ fi # run pylint one file / module at a time, otherwise it sometimes gets # confused -for i in "${top_srcdir}"/anaconda $(find "${top_srcdir}/pyanaconda" -type f -name '*py' \! -executable); do +if [ -z "$FILES" ]; then + FILES="${top_srcdir}/anaconda $(find "${top_srcdir}/pyanaconda" -type f -name '*py' \! -executable)" +fi +for i in $FILES; do if [ -n "$(echo "$i" | grep 'pyanaconda/packaging/dnfpayload.py$')" ]; then continue fi -- 1.8.3.1

3 3

[PATCH] add pre-commit hook to run pylint
by Brian C. Lane 13 Sep '13

13 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> This hook will run the runpylint.sh test on just the files changed in the commit. --- scripts/githooks/README | 14 ++++++++++++++ scripts/githooks/pre-commit | 47 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100755 scripts/githooks/pre-commit diff --git a/scripts/githooks/README b/scripts/githooks/README index a3087a2..92bccd7 100644 --- a/scripts/githooks/README +++ b/scripts/githooks/README @@ -10,3 +10,17 @@ commit-msg also want to create a ~/.rhbzauth file containing two shell variables: RHBZ_USER and RHBZ_PASSWORD to allow automatic login when commiting patches. + +pre-commit + Run the runpylint.sh test on the files changed in the commit. + + To use, copy this script to your .git/hooks directory and + edit the OTHER_MODULES_PATH to point to where you normally have + pykickstart and blivet checked out. Note that if the current + working versions of these differ too much the pylint checks may + fail. + + Set the NOPYLINT= environmental variable while committing to skip + running pylint. eg. + NOPYLINT= git commit -a -m "I didn't break it" + diff --git a/scripts/githooks/pre-commit b/scripts/githooks/pre-commit new file mode 100755 index 0000000..7ab2df7 --- /dev/null +++ b/scripts/githooks/pre-commit @@ -0,0 +1,47 @@ +#!/usr/bin/python +""" Run the Anaconda pylint tests on the files changed in this commit + + Set NOPYLINT env variable to skip this. eg. NOPYLINT= git commit + + +""" +import os +import sys +from subprocess import check_output, CalledProcessError + +OTHER_MODULES_PATH = ".:../blivet/:../pykickstart/" + +if "NOPYLINT" in os.environ: + print "Skipping pre-commit pylint run" + sys.exit(0) + +# run pylint on all the python files changed by this commit +try: + git_files = check_output("git diff-index --cached HEAD", shell=True) +except CalledProcessError: + sys.exit(1) + +pylint_files = [] +# Lines look like: :100755 100755 2cf57974e13a2aae778e28f942a4d44bf6567409 6fe1b6caf32d565b2cdb6d1aee250aaddc6d3a04 M tests/pylint/runpylint.sh +for gf in git_files.splitlines(): + path = gf.split()[-1] + if path == "anaconda" or path.endswith(".py"): + pylint_files.append(path) + +if not pylint_files: + sys.exit(0) +pylint_files = " ".join(pylint_files) + +# Make sure pykickstart and blivet can be found +# Note that if the checked out versions are too far off pylint may fail +env = os.environ.copy() +env["PYTHONPATH"] = OTHER_MODULES_PATH + +print "Running pylint on %s" % pylint_files +try: + check_output("./tests/pylint/runpylint.sh %s" % pylint_files, shell=True, env=env) +except CalledProcessError as e: + print e.output + sys.exit(1) + +sys.exit(0) -- 1.8.3.1

2 1

[PATCH 1/3] DNFPayload: mirrorlist can not be an empty string.
by Ales Kozumplik 13 Sep '13

13 Sep '13

From: Ales Kozumplik <ales(a)redhat.com> --- pyanaconda/packaging/dnfpayload.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py index a9bd59e..4380fe8 100644 --- a/pyanaconda/packaging/dnfpayload.py +++ b/pyanaconda/packaging/dnfpayload.py @@ -95,9 +95,11 @@ class DNFPayload(packaging.PackagePayload): def _add_repo(self, ksrepo): repo = self._base.build_repo(ksrepo.name) url = ksrepo.baseurl + mirrorlist = ksrepo.mirrorlist if url: repo.baseurl = [url] - repo.mirrorlist = ksrepo.mirrorlist + if mirrorlist: + repo.mirrorlist = mirrorlist repo.sslverify = not (ksrepo.noverifyssl or flags.noverifyssl) repo.enable() self._base.repos.add(repo) -- 1.8.3.1

2 3

[master] Change needed for the Initial Setup
by Vratislav Podzimek 13 Sep '13

13 Sep '13

Initial Setup should terminate itself automatically if there is nothing to do in it. Example of that is if there are no spokes to be shown. Vratislav Podzimek (1): Do not schedule hubs with no spokes available (#1006357) pyanaconda/ui/tui/__init__.py | 5 +++-- pyanaconda/ui/tui/hubs/__init__.py | 3 +++ pyanaconda/ui/tui/hubs/summary.py | 6 +++++- pyanaconda/ui/tui/simpleline/base.py | 13 +++++++++++-- 4 files changed, 22 insertions(+), 5 deletions(-) -- 1.7.11.7

2 4

[master][PATCH] Use pigz to create updates.img
by Vratislav Podzimek 13 Sep '13

13 Sep '13

Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- scripts/makeupdates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makeupdates b/scripts/makeupdates index 273428a..761fcf2 100755 --- a/scripts/makeupdates +++ b/scripts/makeupdates @@ -389,7 +389,7 @@ def addRpms(updates_path, add_rpms): def createUpdatesImage(cwd, updates): os.chdir(updates) - os.system("find . | cpio -c -o | gzip -9cv > %s/updates.img" % (cwd,)) + os.system("find . | cpio -c -o | pigz -9cv > %s/updates.img" % (cwd,)) sys.stdout.write("updates.img ready\n") def check_for_new_packages(tag, arch, added_rpms, specfile_path): -- 1.7.11.7

2 1

[master][PATCH] Retranslate language filtering placeholder texts (#1007090)
by Vratislav Podzimek 13 Sep '13

13 Sep '13

On the Welcome spoke we need to retranslate the language filtering entry's placeholder text manually, on the Langsupport spoke it happens automatically if it is marked as translatable. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/langsupport.glade | 2 +- pyanaconda/ui/gui/spokes/welcome.glade | 2 +- pyanaconda/ui/gui/spokes/welcome.py | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/langsupport.glade b/pyanaconda/ui/gui/spokes/langsupport.glade index 6727c9b..d499780 100644 --- a/pyanaconda/ui/gui/spokes/langsupport.glade +++ b/pyanaconda/ui/gui/spokes/langsupport.glade @@ -171,7 +171,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"/> </object> <packing> diff --git a/pyanaconda/ui/gui/spokes/welcome.glade b/pyanaconda/ui/gui/spokes/welcome.glade index da6d7ae..8dafd38 100644 --- a/pyanaconda/ui/gui/spokes/welcome.glade +++ b/pyanaconda/ui/gui/spokes/welcome.glade @@ -447,7 +447,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> diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py index 79efdd2..e4fca21 100644 --- a/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py @@ -224,6 +224,13 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke): xlated = _(before) % {"name" : productName.upper(), "version" : productVersion} welcomeLabel.set_label(xlated) + # Retranslate the language (filtering) entry's placeholder text + languageEntry = self.builder.get_object("languageEntry") + if not languageEntry in self._origStrings: + self._origStrings[languageEntry] = languageEntry.get_placeholder_text() + + languageEntry.set_placeholder_text(_(self._origStrings[languageEntry])) + # And of course, don't forget the underlying window. self.window.set_property("distribution", distributionText().upper()) self.window.retranslate(lang) -- 1.7.11.7

2 1

[PATCH] Fix yet another pylint error caught after the fact.
by Chris Lumens 13 Sep '13

13 Sep '13

Guess what I'm getting tired of doing. --- pyanaconda/desktop.py | 2 +- pyanaconda/simpleconfig.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyanaconda/desktop.py b/pyanaconda/desktop.py index eaf73c5..3d73d32 100644 --- a/pyanaconda/desktop.py +++ b/pyanaconda/desktop.py @@ -49,7 +49,7 @@ class Desktop(SimpleConfigFile): super(Desktop, self).__init__() self.runlevel = 3 - def write(self, filename=None): + def write(self, filename=None, use_tmp=True): if self.getDefaultDesktop(): f = open(ROOT_PATH + "/etc/sysconfig/desktop", "w") f.write(str(self)) diff --git a/pyanaconda/simpleconfig.py b/pyanaconda/simpleconfig.py index ae2e3dc..5e474e9 100644 --- a/pyanaconda/simpleconfig.py +++ b/pyanaconda/simpleconfig.py @@ -181,7 +181,7 @@ class IfcfgFile(SimpleConfigFile): SimpleConfigFile.read(self, self.path) return len(self.info) - def write(self, directory=None): + def write(self, directory=None, use_tmp=False): """ Writes values into ifcfg file. """ @@ -192,4 +192,4 @@ class IfcfgFile(SimpleConfigFile): # ifcfg-rh is using inotify IN_CLOSE_WRITE event so we don't use # temporary file for new configuration - SimpleConfigFile.write(self, path, use_tmp=False) + SimpleConfigFile.write(self, path, use_tmp=use_tmp) -- 1.8.1.2

3 6

[rhel6-branch V02] Fix traceback occurring in ppc bootloader code. (#1007724)
by Samantha N. Bueno 13 Sep '13

13 Sep '13

There was still an error in the original, so....here we go again. This actually *does* fix the traceback. ==== This was caused by a couple errors from 6732cc71. Resolves: rhbz#1007724 Related: rhbz#877852 --- booty/ppc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/booty/ppc.py b/booty/ppc.py index 096de39..2cb2103 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -5,11 +5,12 @@ from booty import BootyNoKernelWarning from util import getDiskPart from bootloaderInfo import * import iutil +import parted class ppcBootloaderInfo(bootloaderInfo): def pickPReP(self): # if we created a new PReP partition, pick that - for a in self.storage.findActions(type="create", obj="format"): + for a in self.storage.devicetree.findActions(type="create", object="format"): if a.format.type == "prepboot" and a.device in self.storage.devices: return a.device @@ -38,7 +39,6 @@ class ppcBootloaderInfo(bootloaderInfo): return prepdevs[0] def getBootDevs(self, bl): - import parted retval = [] machine = iutil.getPPCMachine() -- 1.7.11.7

2 1

[master][PATCH] Ignore the whole m4 directory
by Vratislav Podzimek 13 Sep '13

13 Sep '13

Otherwise 'git clean -df' removes it. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e888426..e9d365c 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,7 @@ ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 -m4/*.m4 +m4/ missing po/*.gmo po/*.po -- 1.7.11.7

2 1

[master] XklWrapper refactorization
by Vratislav Podzimek 13 Sep '13

13 Sep '13

These patches have one goal -- to avoid creating new instances of the XklWrapper class on language change because it is an expensive action. However, they also bring better code, more documentation, better "unittest test pontential" and altogether they are -2 lines of code. They apply to David Shea's patches for keyboard layouts and switching options translations because I'd like to keep track of the changes in our git history and it would also allow us to easily revert changes made here if there are any problems within. Vratislav Podzimek (4): Remove the Layout class and things we don't need in XklWrapper Move upcase_first_letter function to iutil Improve XklWrapper's API Translate layout and switching options descriptions on the fly pyanaconda/iutil.py | 21 ++++++ pyanaconda/keyboard.py | 122 +++++++++++++++++------------------ pyanaconda/localization.py | 27 ++------ pyanaconda/ui/gui/spokes/keyboard.py | 18 +++--- 4 files changed, 93 insertions(+), 95 deletions(-) -- 1.7.11.7

2 8

[rhel6-branch] Fix traceback occurring in ppc bootloader code. (#1007724)
by Samantha N. Bueno 13 Sep '13

13 Sep '13

This was caused by a couple errors from 6732cc71. Resolves: rhbz#1007724 Related: rhbz#877852 --- booty/ppc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/booty/ppc.py b/booty/ppc.py index 096de39..8c1ec80 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -5,11 +5,12 @@ from booty import BootyNoKernelWarning from util import getDiskPart from bootloaderInfo import * import iutil +import parted class ppcBootloaderInfo(bootloaderInfo): def pickPReP(self): # if we created a new PReP partition, pick that - for a in self.storage.findActions(type="create", obj="format"): + for a in self.storage.devicetree.findActions(type="create", obj="format"): if a.format.type == "prepboot" and a.device in self.storage.devices: return a.device @@ -38,7 +39,6 @@ class ppcBootloaderInfo(bootloaderInfo): return prepdevs[0] def getBootDevs(self, bl): - import parted retval = [] machine = iutil.getPPCMachine() -- 1.7.11.7

2 1

[PATCH 1/3] DNFPayload: select kernel packages.
by Ales Kozumplik 13 Sep '13

13 Sep '13

From: Ales Kozumplik <ales(a)redhat.com> --- pyanaconda/packaging/dnfpayload.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py index 585d543..01584a1 100644 --- a/pyanaconda/packaging/dnfpayload.py +++ b/pyanaconda/packaging/dnfpayload.py @@ -121,6 +121,7 @@ class DNFPayload(packaging.PackagePayload): map(self._install_package, self._required_pkgs) map(self._select_group, self._required_groups) + self._select_kernel_package() def _bump_tx_id(self): if self.txID is None: @@ -181,6 +182,19 @@ class DNFPayload(packaging.PackagePayload): types.add('optional') self._base.select_group(grp, types) + def _select_kernel_package(self): + kernels = self.kernelPackages + for kernel in kernels: + try: + self._install_package(kernel) + except packaging.NoSuchPackage: + log.info('kernel: no such package %s', kernel) + else: + log.info('kernel: selected %s', kernel) + break + else: + log.error('kernel: failed to select a kernel from %s', kernels) + def _sync_metadata(self, dnf_repo): try: dnf_repo.load() -- 1.8.3.1

3 5

[master] xkeyboard-config string translations
by David Shea 13 Sep '13

13 Sep '13

The earlier patch was half right. This also fixes bz#1007083.

2 5

[master] $srcdir != $builddir
by David Shea 13 Sep '13

13 Sep '13

These patches let you create a directory and build in that directory, instead of building in place in the source tree. For example, you can do something like mkdir build && cd build && ../configure --enable-gtk-doc && make. Bonus: the distcheck target works now.

2 4

[master] handle case of no ifcfg and no hostname (#1002737)
by Brian C. Lane 13 Sep '13

13 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> --- pyanaconda/network.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index d21e9b0..173de7c 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -509,6 +509,9 @@ def kickstartNetworkData(ifcfg=None, hostname=None): # pylint: disable-msg=E1101 return handler.NetworkData(hostname=hostname, bootProto="") + if not ifcfg: + return None + # no network command for bond slaves if ifcfg.get("MASTER"): return None -- 1.8.3.1

2 1

[master] Check ready state before baseRepo (#1007448)
by Brian C. Lane 12 Sep '13

12 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> --- 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 8188667..bc72564 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -473,7 +473,7 @@ class SourceSpoke(NormalSpoke): if flags.automatedInstall and (not self.data.method.method or not self.payload.baseRepo): return False else: - return not self._error and self.status and (self.data.method.method or self.payload.baseRepo) + return not self._error and self.ready and (self.data.method.method or self.payload.baseRepo) @property def mandatory(self): -- 1.8.3.1

2 1

[PATCH] Check whether keyboard translations are stale (#972236)
by David Shea 12 Sep '13

12 Sep '13

--- pyanaconda/keyboard.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py index 5b1643c..5f423c6 100644 --- a/pyanaconda/keyboard.py +++ b/pyanaconda/keyboard.py @@ -371,11 +371,17 @@ class XklWrapper(object): """ _instance = None + _instance_lang = None @staticmethod def get_instance(): + # If the language has changed, we need to grab new strings + if os.environ["LANG"] != XklWrapper._instance_lang: + XklWrapper._instance = None + if not XklWrapper._instance: XklWrapper._instance = XklWrapper() + XklWrapper._instance_lang = os.environ["LANG"] return XklWrapper._instance -- 1.8.3.1

1 1

[PATCH] Fix a format parameter mapping (#1007472)
by David Shea 12 Sep '13

12 Sep '13

--- pyanaconda/ui/gui/spokes/custom.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 393e52a..03e0cdc 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -1242,7 +1242,9 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): min_disks = mdraid.get_raid_min_members(md_level) if len(self._device_disks) < min_disks: error = (_(raid_level_not_enough_disks_msg) - % (raid_level, min_disks, len(self._device_disks))) + % {"level": raid_level, + "min" : min_disks, + "count": len(self._device_disks)}) if error: self.set_warning(error) -- 1.8.3.1

2 2

[master] Langauge/locale selection tweaks
by Vratislav Podzimek 12 Sep '13

12 Sep '13

These two patches tweak the Welcome and Langsupport spokes in a way Chris suggested in his comment. Vratislav Podzimek (2): Set minimal width request for the locales box Center the Langsupport spoke's description pyanaconda/ui/gui/spokes/langsupport.glade | 7 ++++--- pyanaconda/ui/gui/spokes/welcome.glade | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) -- 1.7.11.7

3 4

[master] Keyboard related patches
by Vratislav Podzimek 12 Sep '13

12 Sep '13

PATCH 1/2 fixes quite a serious issue. That's why I cloned the bug and I want it to go to the rhel7-branch as well. PATCH 2/2 is just a refactorization. Vratislav Podzimek (2): Try to use VConsole keymap name as X layout (#1007359) Use constant for default keyboard layout pyanaconda/constants.py | 2 ++ pyanaconda/keyboard.py | 39 ++++++++++++++++++++++++++---------- pyanaconda/ui/gui/spokes/keyboard.py | 11 +++++----- pyanaconda/ui/gui/spokes/welcome.py | 12 +++++------ 4 files changed, 42 insertions(+), 22 deletions(-) -- 1.7.11.7

2 3

[master][PATCH] Retranslate also layout indicator when retranslating BaseWindow (#1007087)
by Vratislav Podzimek 12 Sep '13

12 Sep '13

Also add 'lang' param description to the documentation. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- widgets/src/BaseWindow.c | 4 ++++ widgets/src/LayoutIndicator.c | 16 ++++++++++++++++ widgets/src/LayoutIndicator.h | 1 + widgets/src/StandaloneWindow.c | 1 + 4 files changed, 22 insertions(+) diff --git a/widgets/src/BaseWindow.c b/widgets/src/BaseWindow.c index 6267dbe..67aac36 100644 --- a/widgets/src/BaseWindow.c +++ b/widgets/src/BaseWindow.c @@ -573,6 +573,7 @@ void anaconda_base_window_clear_info(AnacondaBaseWindow *win) { /** * anaconda_base_window_retranslate: * @win: a #AnacondaBaseWindow + * @lang: target language * * Reload translations for this widget as needed. Generally, this is not * needed. However when changing the language during installation, we need @@ -609,6 +610,9 @@ void anaconda_base_window_retranslate(AnacondaBaseWindow *win, const char *lang) } format_beta_label(win, _(win->priv->orig_beta)); + + /* retranslate the layout indicator */ + anaconda_layout_indicator_retranslate(ANACONDA_LAYOUT_INDICATOR(win->priv->layout_indicator)); } static GtkBuildableIface *parent_buildable_iface; diff --git a/widgets/src/LayoutIndicator.c b/widgets/src/LayoutIndicator.c index e50987c..c76768d 100644 --- a/widgets/src/LayoutIndicator.c +++ b/widgets/src/LayoutIndicator.c @@ -444,3 +444,19 @@ void anaconda_layout_indicator_set_label_width(AnacondaLayoutIndicator *indicato anaconda_layout_indicator_set_property(G_OBJECT(indicator), PROP_LABEL_WIDTH, &width, NULL); } + +/** + * anaconda_layout_indicator_retranslate: + * @indicator: a #AnacondaLayoutIndicator + * + * Reload translations for this widget as needed. Generally, this is not + * needed. However when changing the language during installation, we need to + * be able to make sure the screen gets retranslated. This function must be + * called after the LANG environment variable, locale and gettext magic are set. + * + * 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)); +} diff --git a/widgets/src/LayoutIndicator.h b/widgets/src/LayoutIndicator.h index 82694e6..d598e8b 100644 --- a/widgets/src/LayoutIndicator.h +++ b/widgets/src/LayoutIndicator.h @@ -72,6 +72,7 @@ gchar *anaconda_layout_indicator_get_current_layout (AnacondaLayoutIndicato guint anaconda_layout_indicator_get_label_width (AnacondaLayoutIndicator *indicator); void anaconda_layout_indicator_set_label_width (AnacondaLayoutIndicator *indicator, guint new_width); +void anaconda_layout_indicator_retranslate (AnacondaLayoutIndicator *indicator); G_END_DECLS diff --git a/widgets/src/StandaloneWindow.c b/widgets/src/StandaloneWindow.c index 28b25e2..5bf8c1c 100644 --- a/widgets/src/StandaloneWindow.c +++ b/widgets/src/StandaloneWindow.c @@ -218,6 +218,7 @@ void anaconda_standalone_window_set_may_continue(AnacondaStandaloneWindow *win, /** * anaconda_standalone_window_retranslate: * @win: a #AnacondaStaldaloneWindow + * @lang: target language * * Reload translations for this widget as needed. Generally, this is not * needed. However when changing the language during installation, we need -- 1.7.11.7

2 1

[PATCH] Fix po/Rules-extract so it doesn't remove itself
by David Shea 12 Sep '13

12 Sep '13

--- po/Rules-extract | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/Rules-extract b/po/Rules-extract index dd3e242..506d6f3 100644 --- a/po/Rules-extract +++ b/po/Rules-extract @@ -36,7 +36,7 @@ mostlyclean: mostlyclean-extract mostlyclean-extract: - rm -f Rules-extract \ + rm -f \ $(top_srcdir)/anaconda.po $(top_srcdir)/data/liveinst/gnome/fedora-welcome.po \ $(top_srcdir)/data/liveinst/console.apps/liveinst.h find $(top_srcdir) $ -name '*.glade.h' -o -name '*.desktop.in.h' $ \ -- 1.8.3.1

3 2

[PATCH] Fix po/Rules-extract so it doesn't remove itself
by David Shea 12 Sep '13

12 Sep '13

--- po/Rules-extract | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/Rules-extract b/po/Rules-extract index dd3e242..506d6f3 100644 --- a/po/Rules-extract +++ b/po/Rules-extract @@ -36,7 +36,7 @@ mostlyclean: mostlyclean-extract mostlyclean-extract: - rm -f Rules-extract \ + rm -f \ $(top_srcdir)/anaconda.po $(top_srcdir)/data/liveinst/gnome/fedora-welcome.po \ $(top_srcdir)/data/liveinst/console.apps/liveinst.h find $(top_srcdir) $ -name '*.glade.h' -o -name '*.desktop.in.h' $ \ -- 1.8.3.1

1 0

[PATCH 1/4] DNFPayload: implement selectEnvironment()
by Ales Kozumplik 12 Sep '13

12 Sep '13

From: Ales Kozumplik <ales(a)redhat.com> --- pyanaconda/packaging/dnfpayload.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py index ba7fd27..815f1c5 100644 --- a/pyanaconda/packaging/dnfpayload.py +++ b/pyanaconda/packaging/dnfpayload.py @@ -341,6 +341,10 @@ class DNFPayload(packaging.PackagePayload): super(DNFPayload, self).reset() self.txID = None + def selectEnvironment(self, environmentid): + env = self._base.comps.environment_by_pattern(environmentid) + map(self.selectGroup, (id_.name for id_ in env.group_ids)) + def setup(self, storage): # must end up with the base repo (and its metadata) ready super(DNFPayload, self).setup(storage) -- 1.8.3.1

3 8

[master][PATCH] Include LayoutIndicator to the Micsellaneous Widgets section
by Vratislav Podzimek 12 Sep '13

12 Sep '13

Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- widgets/doc/AnacondaWidgets-docs.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/widgets/doc/AnacondaWidgets-docs.xml b/widgets/doc/AnacondaWidgets-docs.xml index 01838a1..fcc3a6f 100644 --- a/widgets/doc/AnacondaWidgets-docs.xml +++ b/widgets/doc/AnacondaWidgets-docs.xml @@ -38,6 +38,7 @@ <chapter id="miscellaneous"> <title>Miscellaneous Widgets</title> <xi:include href="xml/SpokeSelector.xml" /> + <xi:include href="xml/LayoutIndicator.xml" /> </chapter> <chapter id="misc-functions"> -- 1.7.11.7

2 2

[PATCH] Don't set up the resize slider for non-resizable devices. (#997690)
by David Lehman 11 Sep '13

11 Sep '13

The setup method was actually triggering a signal handler for a changed value, which caused trouble since the device was not resizable. --- pyanaconda/ui/gui/spokes/lib/resize.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/lib/resize.py b/pyanaconda/ui/gui/spokes/lib/resize.py index aaf987c..f4b8e84 100644 --- a/pyanaconda/ui/gui/spokes/lib/resize.py +++ b/pyanaconda/ui/gui/spokes/lib/resize.py @@ -265,7 +265,8 @@ class ResizeDialog(GUIObject): # button insensitive. self._shrinkButton.set_sensitive(device.resizable) - self._setup_slider(device, obj.target) + if device.resizable: + self._setup_slider(device, obj.target) # Then, disable the button for whatever action is currently selected. # It doesn't make a lot of sense to allow clicking that. -- 1.8.1.4

2 2

Some text UI clean-up
by Samantha N. Bueno 11 Sep '13

11 Sep '13

Just some clean-up of the text UI that needed to get done: First patch cleans up input handling, which had some inconsistencies and other sloppiness. Most of this is just moving code around, renaming things, and deleting unneeded bits. Second patch just gets rid of an unneeded property in the storage spoke.

3 14

[master] Networking related patches
by Vratislav Podzimek 11 Sep '13

11 Sep '13

PATCH 1/2 is useful for the Anaconda installer and the Initial Setup as the hostname of the runtime system is updated to a value set by user. PATCH 2/2 fixes a potential issue that was not hit yet, because we are writing out ifcfg files only in some special cases (otherwise we copy those from the runtime system). Vratislav Podzimek (2): Set hostname when leaving network spokes Don't use temporary file and move when writing out an ifcfg file pyanaconda/simpleconfig.py | 7 ++++--- pyanaconda/ui/gui/spokes/network.py | 8 ++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) -- 1.7.11.7

2 8

[PATCH] Convert the lightobject into a GObject (#1000927)
by David Shea 11 Sep '13

11 Sep '13

Replaced the anaconda_lb functions with an AnacondaLightbox class that inherits from GtkWindow. Increased the soversion and the widget package version. Fixed the signal handler usage. --- pyanaconda/ui/gui/__init__.py | 2 +- pyanaconda/ui/gui/tools/run-spoke.py | 2 +- pyanaconda/ui/gui/utils.py | 4 +- scripts/makeupdates | 2 +- widgets/configure.ac | 2 +- widgets/src/Makefile.am | 2 +- widgets/src/lightbox.c | 408 +++++++++++++++++++++++++---------- widgets/src/lightbox.h | 43 +++- 8 files changed, 345 insertions(+), 120 deletions(-) diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index 803427c..7f18c4b 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -559,7 +559,7 @@ class GraphicalUserInterface(UserInterface): # if there are no actions (not populated yet), we can do nothing if len(self._actions) > 0 and self._currentAction: - lightbox = AnacondaWidgets.lb_show_over(self._currentAction.window) + lightbox = AnacondaWidgets.Lightbox(parent_window=self._currentAction.window) ANACONDA_WINDOW_GROUP.add_window(lightbox) window.main_window.set_transient_for(lightbox) diff --git a/pyanaconda/ui/gui/tools/run-spoke.py b/pyanaconda/ui/gui/tools/run-spoke.py index d3a83a4..d7101cf 100755 --- a/pyanaconda/ui/gui/tools/run-spoke.py +++ b/pyanaconda/ui/gui/tools/run-spoke.py @@ -20,7 +20,7 @@ if len(sys.argv)<2: sys.exit(1) # This is a hack to make sure the AnacondaWidgets library gets loaded -ctypes.CDLL("libAnacondaWidgets.so.0", ctypes.RTLD_GLOBAL) +ctypes.CDLL("libAnacondaWidgets.so.1", ctypes.RTLD_GLOBAL) # Logging always needs to be set up first thing, or there'll be tracebacks. from pyanaconda import anaconda_log diff --git a/pyanaconda/ui/gui/utils.py b/pyanaconda/ui/gui/utils.py index 38e0f4c..aa4078d 100644 --- a/pyanaconda/ui/gui/utils.py +++ b/pyanaconda/ui/gui/utils.py @@ -97,11 +97,11 @@ def enlightbox(mainWindow, dialog): # importing globally would cause a circular dependency from pyanaconda.ui.gui import ANACONDA_WINDOW_GROUP - lightbox = AnacondaWidgets.lb_show_over(mainWindow) + lightbox = AnacondaWidgets.Lightbox(parent_window=mainWindow) ANACONDA_WINDOW_GROUP.add_window(lightbox) dialog.set_transient_for(lightbox) yield - AnacondaWidgets.lb_destroy(lightbox) + lightbox.destroy() def ignoreEscape(dlg): """Prevent a dialog from accepting the escape keybinding, which emits a diff --git a/scripts/makeupdates b/scripts/makeupdates index 6e291fd..273428a 100755 --- a/scripts/makeupdates +++ b/scripts/makeupdates @@ -358,7 +358,7 @@ def copyUpdatedWidgets(updates, cwd): os.system('make') - files = ["libAnacondaWidgets.so", "libAnacondaWidgets.so.0", "libAnacondaWidgets.so.0.0.0"] + files = ["libAnacondaWidgets.so", "libAnacondaWidgets.so.1", "libAnacondaWidgets.so.1.0.0"] for f in files: path = os.path.normpath(cwd + "/widgets/src/.libs/" + f) if os.path.islink(path) and not os.path.exists(updates + libdir + os.path.basename(path)): diff --git a/widgets/configure.ac b/widgets/configure.ac index b0d5f58..baac242 100644 --- a/widgets/configure.ac +++ b/widgets/configure.ac @@ -20,7 +20,7 @@ # AC_PREREQ([2.63]) -AC_INIT([AnacondaWidgets], [1.0], [clumens(a)redhat.com] +AC_INIT([AnacondaWidgets], [2.0], [clumens(a)redhat.com] AM_INIT_AUTOMAKE([foreign]) AM_SILENT_RULES([yes]) diff --git a/widgets/src/Makefile.am b/widgets/src/Makefile.am index 4b3bfde..aaab626 100644 --- a/widgets/src/Makefile.am +++ b/widgets/src/Makefile.am @@ -65,7 +65,7 @@ libAnacondaWidgets_la_CFLAGS = $(GTK_CFLAGS) $(GLADEUI_CFLAGS) $(LIBXKLAVIER_CFL -DWIDGETS_DATADIR=$(WIDGETSDATA)\ -DTZMAP_DATADIR=$(TZMAPDATA) libAnacondaWidgets_la_LIBADD = $(GTK_LIBS) $(GLADEUI_LIBS) $(LIBXKLAVIER_LIBS) -libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) +libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) -version-info 1:0:0 libAnacondaWidgets_la_SOURCES = $(SOURCES) $(HDRS) \ glade-adaptor.c diff --git a/widgets/src/lightbox.c b/widgets/src/lightbox.c index 43edeeb..5752e7a 100644 --- a/widgets/src/lightbox.c +++ b/widgets/src/lightbox.c @@ -24,152 +24,338 @@ * @title: Lightbox * @short_description: Functions to draw a window over a shaded background * - * The lightbox is a set of functions used to display one window (a dialog or - * other similar window, typically) over top of the main window in the - * background. The main window is shaded out to make the foreground window - * stand out more, as well as to reinforce to the user that the background - * window may not be interacted with. + * The lightbox is a widget used to display one window (a dialog or other + * similar window, typically) over top of the main window in the background. + * The main window is shaded out to make the foreground window stand out more, + * as well as to reinforce to the user that the background window may not be + * interacted with. + * + * The lightbox window will show as soon as it is created. */ #include <cairo.h> -#include <gdk/gdk.h> #include <gtk/gtk.h> #include "lightbox.h" -/* GObject ID for the parent window's configure-event signal handler */ -#define ANACONDA_LB_PARENT_CONFIGURE_EVENT "anaconda-configure-event" +#include "intl.h" + +enum { + PROP_PARENT_WINDOW = 1 +}; + +struct _AnacondaLightboxPrivate { + GtkWindow *transient_parent; + gboolean parent_configure_event_handler_set; + guint parent_configure_event_handler; +}; + +static void anaconda_lightbox_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); +static void anaconda_lightbox_draw_background(GObject *gobject, GParamSpec *psec, gpointer user_data); + +static gboolean anaconda_lb_parent_configure_event(GtkWidget *parent, GdkEvent *event, gpointer lightbox); +static gboolean anaconda_lb_configure_event(GtkWidget *lightbox, GdkEvent *event, gpointer user_data); +static void anaconda_lb_cleanup(GtkWidget *widget, gpointer user_data); + +G_DEFINE_TYPE(AnacondaLightbox, anaconda_lightbox, GTK_TYPE_WINDOW) -static void anaconda_lb_move_window_to_parent(GtkWidget *parent, - GdkEventConfigure *e, - GtkWindow *window) +static void anaconda_lightbox_class_init(AnacondaLightboxClass *klass) { - GdkWindow *p_window, *w_window; - int pwidth, pheight, width, height, px, py, x, y, nx, ny; + GObjectClass *object_class = G_OBJECT_CLASS(klass); - if (!GTK_IS_WIDGET(parent) || !GTK_IS_WINDOW(window)) - return; + object_class->set_property = anaconda_lightbox_set_property; - p_window = gtk_widget_get_window (parent); - w_window = gtk_widget_get_window (GTK_WIDGET(window)); + /** + * AnacondaLightbox:parent-window: + * + * The parent of this window. This value is used as the transient parent + * for this window. + * + * Since: 2.0 + */ + g_object_class_install_property(object_class, + PROP_PARENT_WINDOW, + g_param_spec_object("parent-window", + P_("Parent Window"), + P_("The parent of this window"), + GTK_TYPE_WINDOW, + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); - if (!GDK_IS_WINDOW(p_window) || !GDK_IS_WINDOW(w_window)) - return; + g_type_class_add_private(object_class, sizeof(AnacondaLightboxPrivate)); +} + +static void anaconda_lightbox_init(AnacondaLightbox *lightbox) +{ + lightbox->priv = G_TYPE_INSTANCE_GET_PRIVATE(lightbox, + ANACONDA_TYPE_LIGHTBOX, + AnacondaLightboxPrivate + ); + + /* Disable the window decorations on the parent (Gtk.Window) class */ + gtk_container_set_border_width(GTK_CONTAINER(lightbox), 0); + gtk_window_set_decorated(GTK_WINDOW(lightbox), FALSE); + gtk_window_set_has_resize_grip(GTK_WINDOW(lightbox), FALSE); + + /* Indicate we will handle drawing the widget so no theme is applied */ + gtk_widget_set_app_paintable(GTK_WIDGET(lightbox), TRUE); + gtk_window_set_type_hint(GTK_WINDOW(lightbox), GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); + + /* handle restacking events */ + g_signal_connect(lightbox, "configure-event", G_CALLBACK(anaconda_lb_configure_event), NULL); + + /* cleanup */ + g_signal_connect(lightbox, "destroy", G_CALLBACK(anaconda_lb_cleanup), NULL); +} + +static void anaconda_lightbox_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) +{ + AnacondaLightbox *lightbox = ANACONDA_LIGHTBOX(object); + AnacondaLightboxPrivate *priv = lightbox->priv; + + switch (prop_id) + { + case PROP_PARENT_WINDOW: + priv->transient_parent = GTK_WINDOW(g_object_ref(g_value_get_object(value))); + /* The property is CONSTRUCT_ONLY, so no point calling notify */ + anaconda_lightbox_draw_background(object, pspec, NULL); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} + +/* + * Adjust the lightbox any time the parent window's size, position or stacking + * changes. Returns FALSE to allow signal processing to continue. + */ +static gboolean anaconda_lb_parent_configure_event( + GtkWidget *parent, + GdkEvent *event, + gpointer lightbox + ) +{ + /* Always return FALSE to continue processing for this signal. */ + GdkWindow *g_parent_window; + GdkWindow *g_lightbox_window; - pwidth = gdk_window_get_width (p_window); - pheight = gdk_window_get_height (p_window); - gdk_window_get_position(p_window, &px, &py); + if ((event->type != GDK_CONFIGURE) || + !GTK_IS_WIDGET(parent) || + !GTK_IS_WINDOW(lightbox)) + { + return FALSE; + } - width = gdk_window_get_width (w_window); - height = gdk_window_get_height (w_window); - gdk_window_get_position(w_window, &x, &y); + g_lightbox_window = gtk_widget_get_window(GTK_WIDGET(lightbox)); + if (NULL == g_lightbox_window) + { + /* + * No underlying GdkWindow. This may mean the lightbox is not yet + * realized, but whatever the cause, there's nothing we can do here. + */ + return FALSE; + } - nx = px + pwidth / 2 - width / 2; - ny = py + pheight / 2 - height / 2; + /* Resize and move the window according to the event data */ + gdk_window_move_resize(g_lightbox_window, + event->configure.x, + event->configure.y, + event->configure.width, + event->configure.height + ); - if (x != nx || y != ny) + g_parent_window = gtk_widget_get_window(parent); + if (NULL == g_parent_window) { - gdk_window_move (w_window, nx, ny); - gdk_window_restack(w_window, p_window, TRUE); + return FALSE; } - g_object_set_data(G_OBJECT(window), ANACONDA_LB_PARENT_CONFIGURE_EVENT, NULL); + /* Stack the lightbox above the parent */ + gdk_window_restack(g_lightbox_window, g_parent_window, TRUE); + + return FALSE; } -/** - * anaconda_lb_show_over: - * @window: (in) A #GtkWindow - * - * Show lightbox over window. - * - * Return value: (transfer none): the lightbox widget. - * - * Since: 1.0 + +/* + * Draw the window background. Uses the gobject notify handler signature + * in case we want to allow parent-window to change in the future. */ -GtkWindow *anaconda_lb_show_over(GtkWindow *window) +static void anaconda_lightbox_draw_background( + GObject *gobject, + GParamSpec *psec, + gpointer user_data + ) { - GtkWindow *lightbox; - GdkWindow *w_window; - GdkWindow *l_window; - int width, height; - cairo_t *cr; - cairo_pattern_t *pattern; + AnacondaLightbox *lightbox; + + GdkWindow *g_lightbox_window; + GdkWindow *g_parent_window; cairo_surface_t *surface; - guint signal_handler; - - lightbox = (GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL))); - gtk_window_set_transient_for(lightbox, window); - gtk_window_set_decorated(lightbox, FALSE); - gtk_window_set_has_resize_grip(lightbox, FALSE); - gtk_window_set_position(lightbox, GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_type_hint (lightbox, GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); - gtk_widget_set_app_paintable(GTK_WIDGET(lightbox), TRUE); + cairo_pattern_t *pattern; + cairo_t *cr; + + if (!ANACONDA_IS_LIGHTBOX(gobject)) + { + return; + } + + lightbox = ANACONDA_LIGHTBOX(gobject); + + /* + * Skip the check for whether the value has changed, since we only allow + * it to be set in the constructor + */ + + if (lightbox->priv->transient_parent) + { + gtk_window_set_transient_for(GTK_WINDOW(lightbox), lightbox->priv->transient_parent); + + /* Destroy the lightbox when the parent is destroyed */ + gtk_window_set_destroy_with_parent(GTK_WINDOW(lightbox), TRUE); + + /* Set the initial position to the center of the parent */ + gtk_window_set_position(GTK_WINDOW(lightbox), GTK_WIN_POS_CENTER_ON_PARENT); + + /* Set the lightbox to the parent window's dimensions */ + g_parent_window = gtk_widget_get_window(GTK_WIDGET(lightbox->priv->transient_parent)); + gtk_window_set_default_size(GTK_WINDOW(lightbox), + gdk_window_get_width(g_parent_window), + gdk_window_get_height(g_parent_window) + ); + + /* make the shade move with the parent window */ + /* Add a reference for the lightbox pointer held for the handler */ + g_object_ref(lightbox); + lightbox->priv->parent_configure_event_handler = + g_signal_connect(lightbox->priv->transient_parent, "configure-event", + G_CALLBACK(anaconda_lb_parent_configure_event), lightbox); + lightbox->priv->parent_configure_event_handler_set = TRUE; + + /* + * NB: We should probably be handling the draw signal in order to refresh + * the transparent pattern from the parent window whenver something + * changes, but by the time things get to the signal handler the surface is + * already set up and doesn't support alpha channels and replacing it + * doesn't seem to work quite right. Besides, none of these windows are + * supposed to move anyway. + */ + + /* Realize the window to initialize the Gdk objects */ + if (!gtk_widget_get_realized(GTK_WIDGET(lightbox))) + { + gtk_widget_realize(GTK_WIDGET(lightbox)); + } + g_lightbox_window = gtk_widget_get_window(GTK_WIDGET(lightbox)); + + /* Create a new surface that supports alpha content */ + surface = gdk_window_create_similar_surface(g_lightbox_window, + CAIRO_CONTENT_COLOR_ALPHA, + gdk_window_get_width(g_parent_window), + gdk_window_get_height(g_parent_window)); + cr = cairo_create(surface); + + /* Use the parent window as a pattern and paint it on the surface */ + gdk_cairo_set_source_window(cr, g_parent_window, 0, 0); + cairo_paint(cr); + + /* Paint a black, 50% transparent shade */ + cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.5); + cairo_paint(cr); + + cairo_destroy(cr); + + /* Use the surface we painted as the window background */ + pattern = cairo_pattern_create_for_surface(surface); + gdk_window_set_background_pattern(g_lightbox_window, pattern); + cairo_pattern_destroy(pattern); + } - w_window = gtk_widget_get_window (GTK_WIDGET(window)); - width = gdk_window_get_width(w_window); - height = gdk_window_get_height(w_window); - gtk_window_set_default_size(lightbox, width, height); - gtk_widget_realize(GTK_WIDGET(lightbox)); - l_window = gtk_widget_get_window (GTK_WIDGET(lightbox)); - gdk_window_set_background_pattern (l_window, NULL); gtk_widget_show(GTK_WIDGET(lightbox)); - surface = gdk_window_create_similar_surface(l_window, - CAIRO_CONTENT_COLOR_ALPHA, - width, height); - - cr = cairo_create (surface); - gdk_cairo_set_source_window(cr, w_window, 0, 0); - cairo_paint(cr); - cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.5); - cairo_paint(cr); - cairo_destroy(cr); - - pattern = cairo_pattern_create_for_surface (surface); - gdk_window_set_background_pattern(l_window, pattern); - cairo_pattern_destroy (pattern); - - /* make the shade move with the parent window */ - signal_handler = g_signal_connect(window, "configure-event", - G_CALLBACK (anaconda_lb_move_window_to_parent), lightbox); - - /* Save the signal handler in the lightbox so we can remove it later */ - g_object_set_data(G_OBJECT(lightbox), ANACONDA_LB_PARENT_CONFIGURE_EVENT, - GUINT_TO_POINTER(signal_handler)); - - return lightbox; } -/** - * anaconda_lb_destroy: - * @lightbox: a #GtkWindow - * - * Destroys the previously used lightbox. - * - * Since: 1.0 +/* + * Restack the lightbox and its parent any time we receive a configure-event + * on the lightbox */ -void anaconda_lb_destroy(GtkWindow *lightbox) +static gboolean anaconda_lb_configure_event( + GtkWidget *lightbox, + GdkEvent *event, + gpointer user_data + ) { - GtkWindow *window; - gpointer p_signal_handler; + GtkWindow *parent; + GdkWindow *g_parent_window; + GdkWindow *g_lightbox_window; - /* Disconnect the configure-event from the contained window */ - if (GTK_IS_WINDOW(lightbox)) + if ((event->type != GDK_CONFIGURE) || !ANACONDA_IS_LIGHTBOX(lightbox)) { - window = gtk_window_get_transient_for(GTK_WINDOW(lightbox)); + return FALSE; + } - p_signal_handler = g_object_get_data(G_OBJECT(lightbox), - ANACONDA_LB_PARENT_CONFIGURE_EVENT); - if ((NULL != p_signal_handler) && GTK_IS_WINDOW(window)) - { - /* XXX HAAAAAAACK: - * If the configure-event signal handler for the contained window - * hasn't fired yet, do it now. - */ - g_signal_emit_by_name(window, "configure-event", window); + parent = ANACONDA_LIGHTBOX(lightbox)->priv->transient_parent; + if (!GTK_IS_WINDOW(parent)) + { + return FALSE; + } + + g_lightbox_window = gtk_widget_get_window(lightbox); + if (NULL == g_lightbox_window) + { + return FALSE; + } + + g_parent_window = gtk_widget_get_window(GTK_WIDGET(parent)); + if (NULL == g_parent_window) + { + return FALSE; + } + + gdk_window_restack(g_lightbox_window, g_parent_window, TRUE); + return FALSE; +} + +/* Clean up references to lightbox held by the parent window */ +static void anaconda_lb_cleanup(GtkWidget *widget, gpointer user_data) +{ + AnacondaLightbox *lightbox; - g_signal_handler_disconnect(window, GPOINTER_TO_UINT(p_signal_handler)); + /* Remove the signal handlers set on the parent window */ + if (ANACONDA_IS_LIGHTBOX(widget)) + { + lightbox = ANACONDA_LIGHTBOX(widget); + + if (lightbox->priv->parent_configure_event_handler_set) + { + g_signal_handler_disconnect(lightbox->priv->transient_parent, + lightbox->priv->parent_configure_event_handler); + lightbox->priv->parent_configure_event_handler_set = FALSE; + g_object_unref(lightbox); } + + /* Drop the reference for the parent window */ + g_object_unref(lightbox->priv->transient_parent); + lightbox->priv->transient_parent = NULL; } +} + +/** + * anaconda_lightbox_new: + * @parent: The parent for this window + * + * Creates a new #AnacondaLightbox, which is a top-level, undecorated window + * that uses a shaded version of its parent window's background as its own + * background. + * + * Returns: the new lightbox as a #GtkWidget + */ +GtkWidget* anaconda_lightbox_new(GtkWindow *parent) +{ + AnacondaLightbox *lightbox; + + lightbox = ANACONDA_LIGHTBOX(g_object_new(ANACONDA_TYPE_LIGHTBOX, + "parent-window", parent, + NULL)); - gtk_widget_destroy(GTK_WIDGET(lightbox)); + return GTK_WIDGET(lightbox); } diff --git a/widgets/src/lightbox.h b/widgets/src/lightbox.h index 3a97010..7e645e2 100644 --- a/widgets/src/lightbox.h +++ b/widgets/src/lightbox.h @@ -22,7 +22,46 @@ #include <gtk/gtk.h> -GtkWindow *anaconda_lb_show_over(GtkWindow *window); -void anaconda_lb_destroy(GtkWindow *lightbox); +G_BEGIN_DECLS + +#define ANACONDA_TYPE_LIGHTBOX (anaconda_lightbox_get_type()) +#define ANACONDA_LIGHTBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANACONDA_TYPE_LIGHTBOX, AnacondaLightbox)) +#define ANACONDA_LIGHTBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ANACONDA_TYPE_LIGHTBOX, AnacondaLightboxClass)) +#define ANACONDA_IS_LIGHTBOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ANACONDA_TYPE_LIGHTBOX)) +#define ANACONDA_IS_LIGHTBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ANACONDA_TYPE_LIGHTBOX)) +#define ANACONDA_LIGHTBOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ANACONDA_TYPE_LIGHTBOX, AnacondaLightboxClass)) + +typedef struct _AnacondaLightbox AnacondaLightbox; +typedef struct _AnacondaLightboxClass AnacondaLightboxClass; +typedef struct _AnacondaLightboxPrivate AnacondaLightboxPrivate; + +/** + * AnacondaLightbox: + * + * The AnacondaLightbox struct contains only private fields and should not + * be directly accessed. + */ +struct _AnacondaLightbox { + GtkWindow parent; + + /*< private >*/ + AnacondaLightboxPrivate *priv; +}; + +/** + * AnacondaLightboxClass: + * @parent_class: The object class structure needs to be the first element in + * the widget class structure in order for the class mechanism + * to work correctly. This allows a AnacondaLightbox + * pointer to be cast to a #GtkWindow pointer. + */ +struct _AnacondaLightboxClass { + GtkWindowClass parent_class; +}; + +GType anaconda_lightbox_get_type(void); +GtkWidget *anaconda_lightbox_new(GtkWindow *parent); + +G_END_DECLS #endif -- 1.8.3.1

3 5

[master] Languages and locales related patches
by Vratislav Podzimek 11 Sep '13

11 Sep '13

These patches do mainly three things: 1) Rework the Welcome spoke and Langsupport spoke to work with all locales available instead of few locales we think are best for languages we have translations for. 2) Remove the cryptic checkbutton for setting only the language-default keyboard layout instead of a combination with the 'us' layout. Having the layout indicator now, we may set the language-default layout as the only one and switch to it from the default 'us' layout (active on the Welcome spoke) automatically. Exceptions are languages the default layout of which don't support typing ASCII characters. For those layouts we should append 'us' to the list of activated layouts and set up layout switching automatically. 3) Get rid of the expand_langs() function and it's usage resulting in highly-probably nondeterministic results. I've recorded a video preview [1] demonstrating the new look and behaviour. [1] http://vpodzime.fedorapeople.org/locales_changes.webm Altough there are many lines of code added by those patches, the overall user experience should be much better and they resolve a lot of bugs and complaints. And I want to come up with a patch dealing with a lot of code duplicated in Welcome and Langsupport spokes' code that should result in many lines removed. However, I'd like to see those 7 patches landing in the Fedora 20 asap because it is quite a significant change for users. Vratislav Podzimek (7): Remove an unused argument of get_available_translations Allow seting up locale without modifying ksdata Remove the cryptic "language-default keyboard" checkbutton Improve import in GUI utils a bit Rework the Welcome spoke to allow users choose from all locales Rework the Langsupport spoke to work with all locales Get rid of the non-deterministic expand_langs and its usage pyanaconda/localization.py | 156 ++++++++----- pyanaconda/packaging/yumpayload.py | 9 +- pyanaconda/ui/gui/hubs/progress.py | 53 +++-- pyanaconda/ui/gui/spokes/langsupport.glade | 167 ++++++++++---- pyanaconda/ui/gui/spokes/langsupport.py | 244 +++++++++++--------- pyanaconda/ui/gui/spokes/welcome.glade | 336 ++++++++++++++-------------- pyanaconda/ui/gui/spokes/welcome.py | 192 +++++++++------- pyanaconda/ui/gui/utils.py | 45 +++- tests/pyanaconda_tests/localization_test.py | 61 ++++- 9 files changed, 772 insertions(+), 491 deletions(-) -- 1.7.11.7

3 14

[master/rhel7-branch] Let users configure autopart options in interactive text ks. (#1001061)
by Samantha N. Bueno 11 Sep '13

11 Sep '13

This patch fixes an issue where partition configuration options were never applied if a user performed an interactive ks install. Resolves: rhbz#1001061 --- pyanaconda/ui/tui/spokes/storage.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py index 7eaa95c..d73c2bc 100644 --- a/pyanaconda/ui/tui/spokes/storage.py +++ b/pyanaconda/ui/tui/spokes/storage.py @@ -70,6 +70,10 @@ class StorageSpoke(NormalTUISpoke): self.errors = [] self.warnings = [] + if not flags.automatedInstall: + # default to using autopart for interactive installs + self.data.autopart.autopart = True + @property def completed(self): retval = bool(self.storage.rootDevice and not self.errors) @@ -213,10 +217,6 @@ class StorageSpoke(NormalTUISpoke): return key def apply(self): - if not flags.automatedInstall: - # default to using autopart for interactive installs - self.data.autopart.autopart = True - self.autopart = self.data.autopart.autopart self.data.ignoredisk.onlyuse = self.selected_disks[:] self.data.clearpart.drives = self.selected_disks[:] @@ -338,6 +338,12 @@ class AutoPartSpoke(NormalTUISpoke): return True def apply(self): + # kind of a hack, but if we're actually getting to this spoke, there + # is no doubt that we are doing autopartitioning, so set autopart to + # True. In the case of ks installs which may not have defined any + # partition options, autopart was never set to True, causing some + # issues. (rhbz#1001061) + self.data.autopart.autopart = True self.data.clearpart.type = self.clearPartType self.data.clearpart.initAll = True -- 1.8.3.1

2 1

[master][PATCH] Make sure XklWrapper isn't dumped to the anaconda-tb file
by Vratislav Podzimek 11 Sep '13

11 Sep '13

Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/exception.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py index 651358c..7c80ca7 100644 --- a/pyanaconda/exception.py +++ b/pyanaconda/exception.py @@ -208,6 +208,7 @@ def initExceptionHandling(anaconda): programArch=os.uname()[4], attrSkipList=["_intf._actions", "_intf._currentAction._xklwrapper", + "_intf._currentAction._spokes[\"KeyboardSpoke\"]._xkl_wrapper", "_intf._currentAction.language.translations", "_intf._currentAction.language.locales", "_intf._currentAction._spokes[\"PasswordSpoke\"]._oldweak", -- 1.7.11.7

2 2

PPC: strengthen PReP-picking algorithm (v3)
by Will Woods 10 Sep '13

10 Sep '13

This version of the patch fixes a potential misfire if bootDevice() is called before partitioning is committed - we could have a "create" action with a later "destroy" action, which would render the earlier "create" moot. The differences from the previous patch are: - if a.format.type == "prepboot": + if a.format.type == "prepboot" and a.device in self.storage.devices: ...which works because (if I understand dlehman correctly) devices that are *actually* going to be created by the requested actions will be in the self.storage.devices list.. and I removed a stray footnote from the commit message. -w

2 2

[PATCH rhel7-branch] (v2) Catch race of network device state vs reading its config properties (#919478, #1005681)
by Radek Vykydal 10 Sep '13

10 Sep '13

Fedora bz: #980576 Catch the infamous DBusException: org.freedesktop.DBus.Error.UnknownMethod: Method "Get" with signature "ss" on interface "org.freedesktop.DBus.Properties" doesn't exist exception. Object with path from devices's IPXConfig property is valid only if its device is in ACTIVATED state. --- pyanaconda/nm.py | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py index dd0df99..0c88800 100644 --- a/pyanaconda/nm.py +++ b/pyanaconda/nm.py @@ -53,7 +53,12 @@ class SettingNotFoundError(ValueError): return self.__repr__() class DeviceSettingsNotFoundError(ValueError): - """Settings (NMRemoteConnection object was not found""" + """Settings NMRemoteConnection object was not found""" + def __str__(self): + return self.__repr__() + +class UnknownMethodGetError(Exception): + """Object does not have Get, most probably being invalid""" def __str__(self): return self.__repr__() @@ -86,6 +91,8 @@ def _get_property(object_path, prop, interface_name_suffix=""): except GLib.GError as e: if "org.freedesktop.DBus.Error.AccessDenied" in e.message: return None + elif "org.freedesktop.DBus.Error.UnknownMethod" in e.message: + raise UnknownMethodGetError else: raise @@ -305,7 +312,12 @@ def nm_device_ip_config(name, version=4): if config == "/": return [] - addresses = _get_property(config, "Addresses", dbus_iface) + try: + addresses = _get_property(config, "Addresses", dbus_iface) + # object is valid only if device is in ACTIVATED state (racy) + except UnknownMethodGetError: + return [] + addr_list = [] for addr, prefix, gateway in addresses: # TODO - look for a library function (could have used IPy but byte order!) @@ -317,7 +329,12 @@ def nm_device_ip_config(name, version=4): gateway_str = nm_dbus_ay_to_ipv6(gateway) addr_list.append([addr_str, prefix, gateway_str]) - nameservers = _get_property(config, "Nameservers", dbus_iface) + try: + nameservers = _get_property(config, "Nameservers", dbus_iface) + # object is valid only if device is in ACTIVATED state (racy) + except UnknownMethodGetError: + return [] + ns_list = [] for ns in nameservers: # TODO - look for a library function @@ -341,7 +358,11 @@ def nm_ntp_servers_from_dhcp(): for device in active_devices: # harvest NTP server addresses from DHCPv4 dhcp4_path = nm_device_property(device, "Dhcp4Config") - options = _get_property(dhcp4_path, "Options", ".DHCP4Config") + try: + options = _get_property(dhcp4_path, "Options", ".DHCP4Config") + # object is valid only if device is in ACTIVATED state (racy) + except UnknownMethodGetError: + options = None if options and 'ntp_servers' in options: # NTP server addresses returned by DHCP are whitespace delimited ntp_servers_string = options["ntp_servers"] -- 1.7.11.7

3 2

[master] Test for and fix gettext problems
by David Shea 10 Sep '13

10 Sep '13

The first patch adds a test that will fail if xgettext displays warnings while processing anything in POTFILES. The warnings about undetected language types are fixed in the second patch, and the warnings about unparameterized strings are fixed in the third. The second patch also fixes our handling of glade files. xgettext sort of supports glade but doesn't very well with glade3, and for that reason we had some makefile rules to use intltool to extract strings. Except we were only looking for glade files in one directory and then never using the generated headers. This fixes that. I reorganized POTFILES.in a little bit, so the .pot file will look it changed it a lot because all of the anaconda strings are at the bottom now. The filename comments in the .pot should be the same for the files that force a language in Rules-extract (anaconda, data/liveinst/gnome/fedora-welcome), but it will change for the files that switch to intltool generated headers (*.glade, fedora-welcome.desktop.in).

2 9

[PATCH rhel7-branch] networking: ports from master + one new
by Radek Vykydal 10 Sep '13

10 Sep '13

[1/5] - [4/5] are straightforward ports from master [5/5] is a new one on top of them I think I need review only for [5/5].

3 8

[PATCH rhel6-branch] PPC: strengthen PReP-picking algorithm (#877852)
by Will Woods 10 Sep '13

10 Sep '13

pSeries-style systems can have multiple PReP partitions, as long as there's only one per disk. It's kind of like the x86 MBR that way. The current code in booty and platform.py *always* picks the first PReP partition, which will fail if if you have (e.g.) an OS already installed on /dev/sda and you're doing a new install onto /dev/sdb. This patch adds ppcBootloaderInfo.pickPReP(), which tries to find the best PReP partition to use according to the following rules: 1) If we're creating a new PReP partition, use that. 2) Otherwise, if there's a PReP partition already on the disk that contains /boot (or "any disk that contains /boot" if mdraid), use that. 3) Failing that, use the first available PReP partition (as before). This should make mkofboot actually install yaboot into the correct PReP partition. IPSeriesPPC.bootDevice() has been changed to use this same algorithm, so the two of them will agree about what the boot device is. ¹ If /boot is an mdraid device, check each of its member disks for a PReP partition, and return the first one found. --- booty/ppc.py | 38 +++++++++++++++++++++++++++++++++----- platform.py | 11 ++--------- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/booty/ppc.py b/booty/ppc.py index 6f62071..3fc5582 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -7,6 +7,36 @@ from bootloaderInfo import * import iutil class ppcBootloaderInfo(bootloaderInfo): + def pickPReP(self): + # if we created a new PReP partition, pick that + for a in self.storage.findActions(type="create", obj="format"): + if a.format.type == "prepboot": + return a.device + + # otherwise, look at the existing PReP partitions. + prepdevs = [] + for dev in self.storage.fsset.devices: + if (dev.format.type == "prepboot" and + dev.partedPartition.getFlag(parted.PARTITION_BOOT)): + prepdevs.append(dev) + + # (no PReP found? bail out.) + if len(prepdevs) == 0: + return None + + # we'd prefer a PReP partition that's on the same disk as /boot. + bootdev = self.storage.mountpoints.get("/boot",self.storage.rootDevice) + if bootdev.type == "mdarray": + bootdisks = set(p.disk for p in bootdev.parents) + else: + bootdisks = set([bootdev.disk]) + for dev in prepdevs: + if dev.disk in bootdisks: + return dev + + # failing that, return the first PReP partition we found + return prepdevs[0] + def getBootDevs(self, bl): import parted @@ -14,10 +44,9 @@ class ppcBootloaderInfo(bootloaderInfo): machine = iutil.getPPCMachine() if machine == 'pSeries': - for dev in self.storage.fsset.devices: - if (dev.format.type == "prepboot" and - dev.partedPartition.getFlag(parted.PARTITION_BOOT)): - retval.append(dev.path) + prep = self.pickPReP() + if prep: + retval.append(prep.path) elif machine == 'PMac': for dev in self.storage.fsset.devices: if dev.format.type == "hfs" and dev.format.bootable: @@ -31,7 +60,6 @@ class ppcBootloaderInfo(bootloaderInfo): except KeyError: # Try / if we don't have this we're not going to work device = self.storage.rootDevice - retval.append(device.path) else: if bl.getDevice(): diff --git a/platform.py b/platform.py index 7bc75ec..e866133 100644 --- a/platform.py +++ b/platform.py @@ -392,15 +392,8 @@ class IPSeriesPPC(PPC): _maxBootPartSize = 10 def bootDevice(self): - bootDev = None - - # We want the first PReP partition. - for device in self.anaconda.id.storage.partitions: - if device.format.type == "prepboot": - bootDev = device - break - - return bootDev + # use booty's PReP-picking algorithm + return self.anaconda.id.bootloader.pickPReP() def bootloaderChoices(self, bl): ret = {} -- 1.8.3.1

2 1

[PATCH] Fix lightbox signal handling (#1000927)
by David Shea 10 Sep '13

10 Sep '13

As part of this, I also: - Removed anaconda_lb_destroy, since it didn't do anything useful that a signal handler couldn't - Bumped the soversion of libAnacondaWidgets since this removes a public interface - Switched to using destroy handlers to cleanup the lightbox references that are set in other objects - Renamed some variables and added some comments to hopefully make it easier to tell what's actually going on --- pyanaconda/ui/gui/tools/run-spoke.py | 2 +- pyanaconda/ui/gui/utils.py | 2 +- scripts/makeupdates | 2 +- widgets/src/Makefile.am | 2 +- widgets/src/lightbox.c | 290 ++++++++++++++++++++++++----------- widgets/src/lightbox.h | 1 - 6 files changed, 206 insertions(+), 93 deletions(-) diff --git a/pyanaconda/ui/gui/tools/run-spoke.py b/pyanaconda/ui/gui/tools/run-spoke.py index d3a83a4..d7101cf 100755 --- a/pyanaconda/ui/gui/tools/run-spoke.py +++ b/pyanaconda/ui/gui/tools/run-spoke.py @@ -20,7 +20,7 @@ if len(sys.argv)<2: sys.exit(1) # This is a hack to make sure the AnacondaWidgets library gets loaded -ctypes.CDLL("libAnacondaWidgets.so.0", ctypes.RTLD_GLOBAL) +ctypes.CDLL("libAnacondaWidgets.so.1", ctypes.RTLD_GLOBAL) # Logging always needs to be set up first thing, or there'll be tracebacks. from pyanaconda import anaconda_log diff --git a/pyanaconda/ui/gui/utils.py b/pyanaconda/ui/gui/utils.py index 38e0f4c..06847dc 100644 --- a/pyanaconda/ui/gui/utils.py +++ b/pyanaconda/ui/gui/utils.py @@ -101,7 +101,7 @@ def enlightbox(mainWindow, dialog): ANACONDA_WINDOW_GROUP.add_window(lightbox) dialog.set_transient_for(lightbox) yield - AnacondaWidgets.lb_destroy(lightbox) + lightbox.destroy() def ignoreEscape(dlg): """Prevent a dialog from accepting the escape keybinding, which emits a diff --git a/scripts/makeupdates b/scripts/makeupdates index 6e291fd..273428a 100755 --- a/scripts/makeupdates +++ b/scripts/makeupdates @@ -358,7 +358,7 @@ def copyUpdatedWidgets(updates, cwd): os.system('make') - files = ["libAnacondaWidgets.so", "libAnacondaWidgets.so.0", "libAnacondaWidgets.so.0.0.0"] + files = ["libAnacondaWidgets.so", "libAnacondaWidgets.so.1", "libAnacondaWidgets.so.1.0.0"] for f in files: path = os.path.normpath(cwd + "/widgets/src/.libs/" + f) if os.path.islink(path) and not os.path.exists(updates + libdir + os.path.basename(path)): diff --git a/widgets/src/Makefile.am b/widgets/src/Makefile.am index 4b3bfde..aaab626 100644 --- a/widgets/src/Makefile.am +++ b/widgets/src/Makefile.am @@ -65,7 +65,7 @@ libAnacondaWidgets_la_CFLAGS = $(GTK_CFLAGS) $(GLADEUI_CFLAGS) $(LIBXKLAVIER_CFL -DWIDGETS_DATADIR=$(WIDGETSDATA)\ -DTZMAP_DATADIR=$(TZMAPDATA) libAnacondaWidgets_la_LIBADD = $(GTK_LIBS) $(GLADEUI_LIBS) $(LIBXKLAVIER_LIBS) -libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) +libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) -version-info 1:0:0 libAnacondaWidgets_la_SOURCES = $(SOURCES) $(HDRS) \ glade-adaptor.c diff --git a/widgets/src/lightbox.c b/widgets/src/lightbox.c index 43edeeb..41b01db 100644 --- a/widgets/src/lightbox.c +++ b/widgets/src/lightbox.c @@ -32,48 +32,150 @@ */ #include <cairo.h> -#include <gdk/gdk.h> #include <gtk/gtk.h> +#include <string.h> #include "lightbox.h" -/* GObject ID for the parent window's configure-event signal handler */ +/* GObject IDs for the parent window's signal handlers */ #define ANACONDA_LB_PARENT_CONFIGURE_EVENT "anaconda-configure-event" +#define ANACONDA_LB_PARENT_DESTROY_EVENT "anaconda-destroy-event" -static void anaconda_lb_move_window_to_parent(GtkWidget *parent, - GdkEventConfigure *e, - GtkWindow *window) +/* + * Restack the lightbox and its parent any time we receive a configure-event + * on the lightbox + */ +static gboolean anaconda_lb_configure_event( + GtkWidget *lightbox, + GdkEvent *event, + gpointer parent + ) { - GdkWindow *p_window, *w_window; - int pwidth, pheight, width, height, px, py, x, y, nx, ny; + GdkWindow *g_parent_window; + GdkWindow *g_lightbox_window; + + if ((event->type != GDK_CONFIGURE) || + !GTK_IS_WIDGET(parent) || + !GTK_IS_WINDOW(lightbox)) + { + return FALSE; + } + + g_lightbox_window = gtk_widget_get_window(lightbox); + if (NULL == g_lightbox_window) + { + return FALSE; + } + + g_parent_window = gtk_widget_get_window(GTK_WIDGET(parent)); + if (NULL == g_parent_window) + { + return FALSE; + } + + gdk_window_restack(g_lightbox_window, g_parent_window, TRUE); + return FALSE; +} + +/* + * Adjust the lightbox any time the parent window's size, position or stacking + * changes. Returns FALSE to allow signal processing to continue. + */ +static gboolean anaconda_lb_parent_configure_event( + GtkWidget *parent, + GdkEvent *event, + gpointer lightbox + ) +{ + /* Always return FALSE to continue processing for this signal. */ + GdkWindow *g_parent_window; + GdkWindow *g_lightbox_window; + + if ((event->type != GDK_CONFIGURE) || + !GTK_IS_WIDGET(parent) || + !GTK_IS_WINDOW(lightbox)) + { + return FALSE; + } - if (!GTK_IS_WIDGET(parent) || !GTK_IS_WINDOW(window)) - return; + g_lightbox_window = gtk_widget_get_window(GTK_WIDGET(lightbox)); + if (NULL == g_lightbox_window) + { + /* + * No underlying GdkWindow. This may mean the lightbox is not yet + * realized, but whatever the cause, there's nothing we can do here. + */ + return FALSE; + } - p_window = gtk_widget_get_window (parent); - w_window = gtk_widget_get_window (GTK_WIDGET(window)); + /* Resize and move the window according to the event data */ + gdk_window_move_resize(g_lightbox_window, + event->configure.x, + event->configure.y, + event->configure.width, + event->configure.height + ); - if (!GDK_IS_WINDOW(p_window) || !GDK_IS_WINDOW(w_window)) - return; + g_parent_window = gtk_widget_get_window(parent); + if (NULL == g_parent_window) + { + return FALSE; + } - pwidth = gdk_window_get_width (p_window); - pheight = gdk_window_get_height (p_window); - gdk_window_get_position(p_window, &px, &py); + /* Stack the lightbox above the parent */ + gdk_window_restack(g_lightbox_window, g_parent_window, TRUE); - width = gdk_window_get_width (w_window); - height = gdk_window_get_height (w_window); - gdk_window_get_position(w_window, &x, &y); + return FALSE; +} - nx = px + pwidth / 2 - width / 2; - ny = py + pheight / 2 - height / 2; +/* Clean up references to lightbox held by the parent window */ +static void anaconda_lb_cleanup(GtkWidget *lightbox, gpointer user_data) +{ + guint *p_configure_event_handler; + guint *p_destroy_event_handler; + GtkWindow *parent; - if (x != nx || y != ny) + /* Remove the signal handlers set on the parent window */ + if (GTK_IS_WINDOW(lightbox)) { - gdk_window_move (w_window, nx, ny); - gdk_window_restack(w_window, p_window, TRUE); + parent = gtk_window_get_transient_for(GTK_WINDOW(lightbox)); + if (GTK_IS_WINDOW(parent)) + { + p_configure_event_handler = g_object_get_data(G_OBJECT(lightbox), + ANACONDA_LB_PARENT_CONFIGURE_EVENT); + p_destroy_event_handler = g_object_get_data(G_OBJECT(lightbox), + ANACONDA_LB_PARENT_DESTROY_EVENT); + + if (NULL != p_configure_event_handler) + { + g_signal_handler_disconnect(parent, GPOINTER_TO_UINT(p_configure_event_handler)); + } + + if (NULL != p_destroy_event_handler) + { + g_signal_handler_disconnect(parent, GPOINTER_TO_UINT(p_destroy_event_handler)); + } + } } +} + +static void anaconda_lb_cleanup_parent(GtkWidget *parent, gpointer user_data) +{ + GtkWidget *lightbox; - g_object_set_data(G_OBJECT(window), ANACONDA_LB_PARENT_CONFIGURE_EVENT, NULL); + /* If the parent window is destoryed, destroy the lightbox */ + if (GTK_IS_WIDGET(user_data)) + { + lightbox = GTK_WIDGET(user_data); + + /* + * Clear the destroy id so we don't try disconnecting a signal handler + * while the handler is being called. + */ + g_object_set_data(G_OBJECT(lightbox), ANACONDA_LB_PARENT_DESTROY_EVENT, NULL); + + gtk_widget_destroy(lightbox); + } } /** @@ -89,87 +191,99 @@ static void anaconda_lb_move_window_to_parent(GtkWidget *parent, GtkWindow *anaconda_lb_show_over(GtkWindow *window) { GtkWindow *lightbox; - GdkWindow *w_window; - GdkWindow *l_window; - int width, height; - cairo_t *cr; - cairo_pattern_t *pattern; + GdkWindow *g_window; + + GdkWindow *g_lightbox_window; + GdkWindow *g_parent_window; cairo_surface_t *surface; - guint signal_handler; + cairo_pattern_t *pattern; + cairo_t *cr; + guint configure_event_handler; + guint destroy_event_handler; + + /* Create a new window on top of the parent */ lightbox = (GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL))); gtk_window_set_transient_for(lightbox, window); + + /* Disable the window decorations */ gtk_window_set_decorated(lightbox, FALSE); gtk_window_set_has_resize_grip(lightbox, FALSE); + + /* Set the initial position to the center of the parent */ gtk_window_set_position(lightbox, GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_type_hint (lightbox, GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); + + /* Indicate we will handle drawing the widget so no theme is applied */ gtk_widget_set_app_paintable(GTK_WIDGET(lightbox), TRUE); + gtk_window_set_type_hint(lightbox, GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); - w_window = gtk_widget_get_window (GTK_WIDGET(window)); - width = gdk_window_get_width(w_window); - height = gdk_window_get_height(w_window); - gtk_window_set_default_size(lightbox, width, height); - gtk_widget_realize(GTK_WIDGET(lightbox)); - l_window = gtk_widget_get_window (GTK_WIDGET(lightbox)); - gdk_window_set_background_pattern (l_window, NULL); - gtk_widget_show(GTK_WIDGET(lightbox)); - surface = gdk_window_create_similar_surface(l_window, - CAIRO_CONTENT_COLOR_ALPHA, - width, height); - - cr = cairo_create (surface); - gdk_cairo_set_source_window(cr, w_window, 0, 0); - cairo_paint(cr); - cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.5); - cairo_paint(cr); - cairo_destroy(cr); + /* Set the lightbox to the parent window's dimensions */ + g_window = gtk_widget_get_window(GTK_WIDGET(window)); + gtk_window_set_default_size(lightbox, + gdk_window_get_width(g_window), + gdk_window_get_height(g_window) + ); - pattern = cairo_pattern_create_for_surface (surface); - gdk_window_set_background_pattern(l_window, pattern); - cairo_pattern_destroy (pattern); + /* handle restacking events */ + g_signal_connect(lightbox, "configure-event", + G_CALLBACK(anaconda_lb_configure_event), window); /* make the shade move with the parent window */ - signal_handler = g_signal_connect(window, "configure-event", - G_CALLBACK (anaconda_lb_move_window_to_parent), lightbox); + configure_event_handler = g_signal_connect(window, "configure-event", + G_CALLBACK(anaconda_lb_parent_configure_event), lightbox); + + /* cleanup */ + g_signal_connect(lightbox, "destroy", G_CALLBACK(anaconda_lb_cleanup), NULL); + destroy_event_handler = g_signal_connect(window, "destroy", + G_CALLBACK(anaconda_lb_cleanup_parent), lightbox); - /* Save the signal handler in the lightbox so we can remove it later */ + /* + * Save the signal handlers set on the parent so they can be removed when + * the lightbox is destroyed. + */ g_object_set_data(G_OBJECT(lightbox), ANACONDA_LB_PARENT_CONFIGURE_EVENT, - GUINT_TO_POINTER(signal_handler)); + GUINT_TO_POINTER(configure_event_handler)); - return lightbox; -} + g_object_set_data(G_OBJECT(lightbox), ANACONDA_LB_PARENT_DESTROY_EVENT, + GUINT_TO_POINTER(destroy_event_handler)); -/** - * anaconda_lb_destroy: - * @lightbox: a #GtkWindow - * - * Destroys the previously used lightbox. - * - * Since: 1.0 - */ -void anaconda_lb_destroy(GtkWindow *lightbox) -{ - GtkWindow *window; - gpointer p_signal_handler; + /* + * NB: We should probably be handling the draw signal in order to refresh + * the transparent pattern from the parent window whenver something + * changes, but by the time things get to the signal handler the surface is + * already set up and doesn't support alpha channels and replacing it + * doesn't seem to work quite right. Besides, none of these windows are + * supposed to move anyway. + */ - /* Disconnect the configure-event from the contained window */ - if (GTK_IS_WINDOW(lightbox)) - { - window = gtk_window_get_transient_for(GTK_WINDOW(lightbox)); + /* Realize the window to initialize the Gdk objects */ + gtk_widget_realize(GTK_WIDGET(lightbox)); + g_lightbox_window = gtk_widget_get_window(GTK_WIDGET(lightbox)); + g_parent_window = gtk_widget_get_window(GTK_WIDGET(window)); - p_signal_handler = g_object_get_data(G_OBJECT(lightbox), - ANACONDA_LB_PARENT_CONFIGURE_EVENT); - if ((NULL != p_signal_handler) && GTK_IS_WINDOW(window)) - { - /* XXX HAAAAAAACK: - * If the configure-event signal handler for the contained window - * hasn't fired yet, do it now. - */ - g_signal_emit_by_name(window, "configure-event", window); + /* Create a new surface that supports alpha content */ + surface = gdk_window_create_similar_surface(g_lightbox_window, + CAIRO_CONTENT_COLOR_ALPHA, + gdk_window_get_width(g_parent_window), + gdk_window_get_height(g_parent_window)); + cr = cairo_create(surface); - g_signal_handler_disconnect(window, GPOINTER_TO_UINT(p_signal_handler)); - } - } + /* Use the parent window as a pattern and paint it on the surface */ + gdk_cairo_set_source_window(cr, g_parent_window, 0, 0); + cairo_paint(cr); - gtk_widget_destroy(GTK_WIDGET(lightbox)); + /* Paint a black, 50% transparent shade */ + cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.5); + cairo_paint(cr); + + cairo_destroy(cr); + + /* Use the surface we painted as the window background */ + pattern = cairo_pattern_create_for_surface(surface); + gdk_window_set_background_pattern(g_lightbox_window, pattern); + cairo_pattern_destroy(pattern); + + gtk_widget_show_all(GTK_WIDGET(lightbox)); + + return lightbox; } diff --git a/widgets/src/lightbox.h b/widgets/src/lightbox.h index 3a97010..db83bd5 100644 --- a/widgets/src/lightbox.h +++ b/widgets/src/lightbox.h @@ -23,6 +23,5 @@ #include <gtk/gtk.h> GtkWindow *anaconda_lb_show_over(GtkWindow *window); -void anaconda_lb_destroy(GtkWindow *lightbox); #endif -- 1.8.3.1

2 4

[PATCH] Remove some more unused imports.
by Chris Lumens 10 Sep '13

10 Sep '13

--- pyanaconda/anaconda.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyanaconda/anaconda.py b/pyanaconda/anaconda.py index 5bc83e5..9a5aecc 100644 --- a/pyanaconda/anaconda.py +++ b/pyanaconda/anaconda.py @@ -28,7 +28,7 @@ # Matt Wilson <msw(a)rpath.com> # -import os, time +import os import sys from constants import ROOT_PATH from tempfile import mkstemp @@ -36,7 +36,6 @@ from tempfile import mkstemp from pyanaconda.bootloader import get_bootloader from pyanaconda import constants from pyanaconda import addons -from pyanaconda.i18n import _ import logging log = logging.getLogger("anaconda") -- 1.8.1.2

2 1

[PATCH rhel6-branch] PPC: strengthen PReP-picking algorithm (#877852)
by Will Woods 10 Sep '13

10 Sep '13

pSeries-style systems can have multiple PReP partitions, as long as there's only one per disk. It's kind of like the x86 MBR that way. The current code in booty and platform.py *always* picks the first PReP partition, which will fail if if you have (e.g.) an OS already installed on /dev/sda and you're doing a new install onto /dev/sdb. This patch adds ppcBootloaderInfo.pickPReP(), which tries to find the best PReP partition to use according to the following rules: 1) If we're creating a new PReP partition, use that; 2) Otherwise, if there's a PReP partition already on the disk that contains /boot, use that; 3) Failing that, use the first available PReP partition (as before). This should make mkofboot actually install yaboot into the correct PReP partition. IPSeriesPPC.bootDevice() has been changed to use this same algorithm, so the two of them will agree about what the boot device is. --- booty/ppc.py | 37 ++++++++++++++++++++++++++++++++----- platform.py | 11 ++--------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/booty/ppc.py b/booty/ppc.py index 6f62071..401f505 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -7,6 +7,35 @@ from bootloaderInfo import * import iutil class ppcBootloaderInfo(bootloaderInfo): + def pickPReP(self): + # if we created a new PReP partition, pick that + for a in self.storage.findActions(type="create", obj="format"): + if a.format.type == "prepboot": + return a.device + + # otherwise, look at the existing PReP partitions. + prepdevs = [] + for dev in self.storage.fsset.devices: + if (dev.format.type == "prepboot" and + dev.partedPartition.getFlag(parted.PARTITION_BOOT)): + prepdevs.append(dev) + + # we'd prefer a PReP partition that's on the same disk as /boot. + try: + bootdisk = self.storage.mountpoints["/boot"].disk + except KeyError: + bootdisk = self.storage.rootDevice.disk + for dev in prepdevs: + if dev.disk == bootdisk: + return dev + + # failing that, return the first PReP partition we found + if len(prepdevs) != 0: + return prepdevs[0] + + # Alas, no PReP to be found.. + return None + def getBootDevs(self, bl): import parted @@ -14,10 +43,9 @@ class ppcBootloaderInfo(bootloaderInfo): machine = iutil.getPPCMachine() if machine == 'pSeries': - for dev in self.storage.fsset.devices: - if (dev.format.type == "prepboot" and - dev.partedPartition.getFlag(parted.PARTITION_BOOT)): - retval.append(dev.path) + prep = self.pickPReP() + if prep: + retval.append(prep.path) elif machine == 'PMac': for dev in self.storage.fsset.devices: if dev.format.type == "hfs" and dev.format.bootable: @@ -31,7 +59,6 @@ class ppcBootloaderInfo(bootloaderInfo): except KeyError: # Try / if we don't have this we're not going to work device = self.storage.rootDevice - retval.append(device.path) else: if bl.getDevice(): diff --git a/platform.py b/platform.py index 7bc75ec..e866133 100644 --- a/platform.py +++ b/platform.py @@ -392,15 +392,8 @@ class IPSeriesPPC(PPC): _maxBootPartSize = 10 def bootDevice(self): - bootDev = None - - # We want the first PReP partition. - for device in self.anaconda.id.storage.partitions: - if device.format.type == "prepboot": - bootDev = device - break - - return bootDev + # use booty's PReP-picking algorithm + return self.anaconda.id.bootloader.pickPReP() def bootloaderChoices(self, bl): ret = {} -- 1.8.3.1

1 1

[PATCH rhel6-branch] PPC: strengthen PReP-picking algorithm (#877852)
by Will Woods 10 Sep '13

10 Sep '13

pSeries-style systems can have multiple PReP partitions, as long as there's only one per disk. It's kind of like the x86 MBR that way. The current code in booty and platform.py *always* picks the first PReP partition, which will fail if if you have (e.g.) an OS already installed on /dev/sda and you're doing a new install onto /dev/sdb. This patch adds ppcBootloaderInfo.pickPReP(), which tries to find the best PReP partition to use according to the following rules: 1) If we're creating a new PReP partition, use that; 2) Otherwise, if there's a PReP partition already on the disk that contains /boot, use that; 3) Failing that, use the first available PReP partition (as before). This should make mkofboot actually install yaboot into the correct PReP partition. IPSeriesPPC.bootDevice() has been changed to use this same algorithm, so the two of them will agree about what the boot device is. --- booty/ppc.py | 37 ++++++++++++++++++++++++++++++++----- platform.py | 11 ++--------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/booty/ppc.py b/booty/ppc.py index 6f62071..401f505 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -7,6 +7,35 @@ from bootloaderInfo import * import iutil class ppcBootloaderInfo(bootloaderInfo): + def pickPReP(self): + # if we created a new PReP partition, pick that + for a in self.storage.findActions(type="create", obj="format"): + if a.format.type == "prepboot": + return a.device + + # otherwise, look at the existing PReP partitions. + prepdevs = [] + for dev in self.storage.fsset.devices: + if (dev.format.type == "prepboot" and + dev.partedPartition.getFlag(parted.PARTITION_BOOT)): + prepdevs.append(dev) + + # we'd prefer a PReP partition that's on the same disk as /boot. + try: + bootdisk = self.storage.mountpoints["/boot"].disk + except KeyError: + bootdisk = self.storage.rootDevice.disk + for dev in prepdevs: + if dev.disk == bootdisk: + return dev + + # failing that, return the first PReP partition we found + if len(prepdevs) != 0: + return prepdevs[0] + + # Alas, no PReP to be found.. + return None + def getBootDevs(self, bl): import parted @@ -14,10 +43,9 @@ class ppcBootloaderInfo(bootloaderInfo): machine = iutil.getPPCMachine() if machine == 'pSeries': - for dev in self.storage.fsset.devices: - if (dev.format.type == "prepboot" and - dev.partedPartition.getFlag(parted.PARTITION_BOOT)): - retval.append(dev.path) + prep = self.pickPReP() + if prep: + retval.append(prep.path) elif machine == 'PMac': for dev in self.storage.fsset.devices: if dev.format.type == "hfs" and dev.format.bootable: @@ -31,7 +59,6 @@ class ppcBootloaderInfo(bootloaderInfo): except KeyError: # Try / if we don't have this we're not going to work device = self.storage.rootDevice - retval.append(device.path) else: if bl.getDevice(): diff --git a/platform.py b/platform.py index 7bc75ec..e866133 100644 --- a/platform.py +++ b/platform.py @@ -392,15 +392,8 @@ class IPSeriesPPC(PPC): _maxBootPartSize = 10 def bootDevice(self): - bootDev = None - - # We want the first PReP partition. - for device in self.anaconda.id.storage.partitions: - if device.format.type == "prepboot": - bootDev = device - break - - return bootDev + # use booty's PReP-picking algorithm + return self.anaconda.id.bootloader.pickPReP() def bootloaderChoices(self, bl): ret = {} -- 1.8.3.1

3 3

[PATCH] Remove unused imports in the network spoke.
by Chris Lumens 10 Sep '13

10 Sep '13

--- pyanaconda/ui/gui/spokes/network.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index 43d12e1..7be4229 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -48,9 +48,7 @@ from pyanaconda.nm import nm_device_setting_value, nm_device_ip_config from gi.repository import GLib, GObject, Pango, Gio, NetworkManager, NMClient import dbus import dbus.service -import socket import subprocess -import struct import string from dbus.mainloop.glib import DBusGMainLoop -- 1.8.1.2

2 1

[master][PATCH] Move the Anaconda class to a proper module
by Vratislav Podzimek 10 Sep '13

10 Sep '13

This prevents unittests, ipython sessions, etc. from importing a bunch of modules when anything is imported from the pyanaconda package. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- anaconda | 2 +- pyanaconda/__init__.py | 228 ------------------------------------------------- pyanaconda/anaconda.py | 228 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 229 insertions(+), 229 deletions(-) create mode 100644 pyanaconda/anaconda.py diff --git a/anaconda b/anaconda index fd8e2fe..3e745e3 100755 --- a/anaconda +++ b/anaconda @@ -766,7 +766,7 @@ if __name__ == "__main__": else: print "anaconda %s (pre-release) started." % verdesc - from pyanaconda import Anaconda + from pyanaconda.anaconda import Anaconda anaconda = Anaconda() iutil.setup_translations(gettext) diff --git a/pyanaconda/__init__.py b/pyanaconda/__init__.py index 5bc83e5..e69de29 100644 --- a/pyanaconda/__init__.py +++ b/pyanaconda/__init__.py @@ -1,228 +0,0 @@ -#!/usr/bin/python -# -# anaconda: The Red Hat Linux Installation program -# -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -# Red Hat, Inc. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Author(s): Brent Fox <bfox(a)redhat.com> -# Mike Fulbright <msf(a)redhat.com> -# Jakub Jelinek <jakub(a)redhat.com> -# Jeremy Katz <katzj(a)redhat.com> -# Chris Lumens <clumens(a)redhat.com> -# Paul Nasrat <pnasrat(a)redhat.com> -# Erik Troan <ewt(a)rpath.com> -# Matt Wilson <msw(a)rpath.com> -# - -import os, time -import sys -from constants import ROOT_PATH -from tempfile import mkstemp - -from pyanaconda.bootloader import get_bootloader -from pyanaconda import constants -from pyanaconda import addons -from pyanaconda.i18n import _ - -import logging -log = logging.getLogger("anaconda") -stdoutLog = logging.getLogger("anaconda.stdout") - -class Anaconda(object): - def __init__(self): - import desktop - - self._bootloader = None - self.canReIPL = False - self.desktop = desktop.Desktop() - self.dir = None - self.displayMode = None - self.extraModules = [] - self.id = None - self._instClass = None - self._intf = None - self.isHeadless = False - self.ksdata = None - self.mediaDevice = None - self.methodstr = None - self.opts = None - self._payload = None - self.proxy = None - self.proxyUsername = None - self.proxyPassword = None - self.reIPLMessage = None - self.rescue = False - self.rescue_mount = True - self.rootParts = None - - self.stage2 = None - self._storage = None - self.updateSrc = None - self.mehConfig = None - - # *sigh* we still need to be able to write this out - self.xdriver = None - - @property - def bootloader(self): - if not self._bootloader: - self._bootloader = get_bootloader() - - return self._bootloader - - @property - def instClass(self): - if not self._instClass: - from installclass import DefaultInstall - self._instClass = DefaultInstall() - - return self._instClass - - def _getInterface(self): - return self._intf - - def _setInterface(self, v): - # "lambda cannot contain assignment" - self._intf = v - - def _delInterface(self): - del self._intf - - intf = property(_getInterface, _setInterface, _delInterface) - - @property - def payload(self): - # Try to find the packaging payload class. First try the install - # class. If it doesn't give us one, fall back to the default. - if not self._payload: - klass = self.instClass.getBackend() - - if not klass: - from flags import flags - - if flags.livecdInstall: - from pyanaconda.packaging.livepayload import LiveImagePayload - klass = LiveImagePayload - elif self.ksdata.method.method == "liveimg": - from pyanaconda.packaging.livepayload import LiveImageKSPayload - klass = LiveImageKSPayload - elif flags.dnf: - from pyanaconda.packaging.dnfpayload import DNFPayload as klass - else: - from pyanaconda.packaging.yumpayload import YumPayload - klass = YumPayload - - self._payload = klass(self.ksdata) - - return self._payload - - @property - def protected(self): - import stat - specs = [] - if os.path.exists("/run/initramfs/livedev") and \ - stat.S_ISBLK(os.stat("/run/initramfs/livedev")[stat.ST_MODE]): - specs.append(os.readlink("/run/initramfs/livedev")) - - if self.methodstr and self.methodstr.startswith("hd:"): - specs.append(self.methodstr[3:].split(":", 3)[0]) - - if self.stage2 and self.stage2.startswith("hd:"): - specs.append(self.stage2[3:].split(":", 3)[0]) - - return specs - - @property - def storage(self): - if not self._storage: - import blivet - self._storage = blivet.Blivet(ksdata=self.ksdata) - - if self.instClass.defaultFS: - self._storage.setDefaultFSType(self.instClass.defaultFS) - - return self._storage - - def dumpState(self): - from meh import ExceptionInfo - from meh.dump import ReverseExceptionDump - from inspect import stack as _stack - from traceback import format_stack - - # Skip the frames for dumpState and the signal handler. - stack = _stack()[2:] - stack.reverse() - exn = ReverseExceptionDump(ExceptionInfo(None, None, stack), - self.mehConfig) - - # gather up info on the running threads - threads = "\nThreads\n-------\n" - for thread_id, frame in sys._current_frames().iteritems(): - threads += "\nThread %s\n" % (thread_id,) - threads += "".join(format_stack(frame)) - - # dump to a unique file - (fd, filename) = mkstemp(prefix="anaconda-tb-", dir="/tmp") - dump_text = exn.traceback_and_object_dump(self) - dump_text += threads - dump_text = dump_text.encode("utf-8") - os.write(fd, dump_text) - os.close(fd) - - # append to a given file - with open("/tmp/anaconda-tb-all.log", "a+") as f: - f.write("--- traceback: %s ---\n" % filename) - f.write(dump_text + "\n") - - def initInterface(self, addon_paths=None): - if self._intf: - raise RuntimeError("Second attempt to initialize the InstallInterface") - - if self.displayMode == 'g': - from pyanaconda.ui.gui import GraphicalUserInterface - self._intf = GraphicalUserInterface(self.storage, self.payload, - self.instClass) - - # needs to be refreshed now we know if gui or tui will take place - addon_paths = addons.collect_addon_paths(constants.ADDON_PATHS, - ui_subdir="gui") - elif self.displayMode in ['t', 'c']: # text and command line are the same - from pyanaconda.ui.tui import TextUserInterface - self._intf = TextUserInterface(self.storage, self.payload, - self.instClass) - - # needs to be refreshed now we know if gui or tui will take place - addon_paths = addons.collect_addon_paths(constants.ADDON_PATHS, - ui_subdir="tui") - else: - raise RuntimeError("Unsupported displayMode: %s" % self.displayMode) - - if addon_paths: - self._intf.update_paths(addon_paths) - - def writeXdriver(self, root = None): - # this should go away at some point, but until it does, we - # need to keep it around. - if self.xdriver is None: - return - if root is None: - root = ROOT_PATH - if not os.path.isdir("%s/etc/X11" %(root,)): - os.makedirs("%s/etc/X11" %(root,), mode=0755) - f = open("%s/etc/X11/xorg.conf" %(root,), 'w') - f.write('Section "Device"\n\tIdentifier "Videocard0"\n\tDriver "%s"\nEndSection\n' % self.xdriver) - f.close() diff --git a/pyanaconda/anaconda.py b/pyanaconda/anaconda.py new file mode 100644 index 0000000..5bc83e5 --- /dev/null +++ b/pyanaconda/anaconda.py @@ -0,0 +1,228 @@ +#!/usr/bin/python +# +# anaconda: The Red Hat Linux Installation program +# +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +# Red Hat, Inc. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# Author(s): Brent Fox <bfox(a)redhat.com> +# Mike Fulbright <msf(a)redhat.com> +# Jakub Jelinek <jakub(a)redhat.com> +# Jeremy Katz <katzj(a)redhat.com> +# Chris Lumens <clumens(a)redhat.com> +# Paul Nasrat <pnasrat(a)redhat.com> +# Erik Troan <ewt(a)rpath.com> +# Matt Wilson <msw(a)rpath.com> +# + +import os, time +import sys +from constants import ROOT_PATH +from tempfile import mkstemp + +from pyanaconda.bootloader import get_bootloader +from pyanaconda import constants +from pyanaconda import addons +from pyanaconda.i18n import _ + +import logging +log = logging.getLogger("anaconda") +stdoutLog = logging.getLogger("anaconda.stdout") + +class Anaconda(object): + def __init__(self): + import desktop + + self._bootloader = None + self.canReIPL = False + self.desktop = desktop.Desktop() + self.dir = None + self.displayMode = None + self.extraModules = [] + self.id = None + self._instClass = None + self._intf = None + self.isHeadless = False + self.ksdata = None + self.mediaDevice = None + self.methodstr = None + self.opts = None + self._payload = None + self.proxy = None + self.proxyUsername = None + self.proxyPassword = None + self.reIPLMessage = None + self.rescue = False + self.rescue_mount = True + self.rootParts = None + + self.stage2 = None + self._storage = None + self.updateSrc = None + self.mehConfig = None + + # *sigh* we still need to be able to write this out + self.xdriver = None + + @property + def bootloader(self): + if not self._bootloader: + self._bootloader = get_bootloader() + + return self._bootloader + + @property + def instClass(self): + if not self._instClass: + from installclass import DefaultInstall + self._instClass = DefaultInstall() + + return self._instClass + + def _getInterface(self): + return self._intf + + def _setInterface(self, v): + # "lambda cannot contain assignment" + self._intf = v + + def _delInterface(self): + del self._intf + + intf = property(_getInterface, _setInterface, _delInterface) + + @property + def payload(self): + # Try to find the packaging payload class. First try the install + # class. If it doesn't give us one, fall back to the default. + if not self._payload: + klass = self.instClass.getBackend() + + if not klass: + from flags import flags + + if flags.livecdInstall: + from pyanaconda.packaging.livepayload import LiveImagePayload + klass = LiveImagePayload + elif self.ksdata.method.method == "liveimg": + from pyanaconda.packaging.livepayload import LiveImageKSPayload + klass = LiveImageKSPayload + elif flags.dnf: + from pyanaconda.packaging.dnfpayload import DNFPayload as klass + else: + from pyanaconda.packaging.yumpayload import YumPayload + klass = YumPayload + + self._payload = klass(self.ksdata) + + return self._payload + + @property + def protected(self): + import stat + specs = [] + if os.path.exists("/run/initramfs/livedev") and \ + stat.S_ISBLK(os.stat("/run/initramfs/livedev")[stat.ST_MODE]): + specs.append(os.readlink("/run/initramfs/livedev")) + + if self.methodstr and self.methodstr.startswith("hd:"): + specs.append(self.methodstr[3:].split(":", 3)[0]) + + if self.stage2 and self.stage2.startswith("hd:"): + specs.append(self.stage2[3:].split(":", 3)[0]) + + return specs + + @property + def storage(self): + if not self._storage: + import blivet + self._storage = blivet.Blivet(ksdata=self.ksdata) + + if self.instClass.defaultFS: + self._storage.setDefaultFSType(self.instClass.defaultFS) + + return self._storage + + def dumpState(self): + from meh import ExceptionInfo + from meh.dump import ReverseExceptionDump + from inspect import stack as _stack + from traceback import format_stack + + # Skip the frames for dumpState and the signal handler. + stack = _stack()[2:] + stack.reverse() + exn = ReverseExceptionDump(ExceptionInfo(None, None, stack), + self.mehConfig) + + # gather up info on the running threads + threads = "\nThreads\n-------\n" + for thread_id, frame in sys._current_frames().iteritems(): + threads += "\nThread %s\n" % (thread_id,) + threads += "".join(format_stack(frame)) + + # dump to a unique file + (fd, filename) = mkstemp(prefix="anaconda-tb-", dir="/tmp") + dump_text = exn.traceback_and_object_dump(self) + dump_text += threads + dump_text = dump_text.encode("utf-8") + os.write(fd, dump_text) + os.close(fd) + + # append to a given file + with open("/tmp/anaconda-tb-all.log", "a+") as f: + f.write("--- traceback: %s ---\n" % filename) + f.write(dump_text + "\n") + + def initInterface(self, addon_paths=None): + if self._intf: + raise RuntimeError("Second attempt to initialize the InstallInterface") + + if self.displayMode == 'g': + from pyanaconda.ui.gui import GraphicalUserInterface + self._intf = GraphicalUserInterface(self.storage, self.payload, + self.instClass) + + # needs to be refreshed now we know if gui or tui will take place + addon_paths = addons.collect_addon_paths(constants.ADDON_PATHS, + ui_subdir="gui") + elif self.displayMode in ['t', 'c']: # text and command line are the same + from pyanaconda.ui.tui import TextUserInterface + self._intf = TextUserInterface(self.storage, self.payload, + self.instClass) + + # needs to be refreshed now we know if gui or tui will take place + addon_paths = addons.collect_addon_paths(constants.ADDON_PATHS, + ui_subdir="tui") + else: + raise RuntimeError("Unsupported displayMode: %s" % self.displayMode) + + if addon_paths: + self._intf.update_paths(addon_paths) + + def writeXdriver(self, root = None): + # this should go away at some point, but until it does, we + # need to keep it around. + if self.xdriver is None: + return + if root is None: + root = ROOT_PATH + if not os.path.isdir("%s/etc/X11" %(root,)): + os.makedirs("%s/etc/X11" %(root,), mode=0755) + f = open("%s/etc/X11/xorg.conf" %(root,), 'w') + f.write('Section "Device"\n\tIdentifier "Videocard0"\n\tDriver "%s"\nEndSection\n' % self.xdriver) + f.close() -- 1.7.11.7

2 1

[master/rhel7-branch][PATCH] Firstboot should be disabled by default after automated installations
by Vratislav Podzimek 10 Sep '13

10 Sep '13

Resolves: rhbz#985277 Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/install.py | 1 + pyanaconda/kickstart.py | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/pyanaconda/install.py b/pyanaconda/install.py index 4b23016..0742d6f 100644 --- a/pyanaconda/install.py +++ b/pyanaconda/install.py @@ -131,6 +131,7 @@ def doInstall(storage, payload, ksdata, instClass): threadMgr.wait_all() with progress_report(_("Setting up the installation environment")): + ksdata.firstboot.setup(storage, ksdata, instClass) ksdata.addons.setup(storage, ksdata, instClass) storage.updateKSData() # this puts custom storage info into ksdata diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index d6baaaa..3963889 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -531,6 +531,11 @@ class Firewall(commands.firewall.F14_Firewall): iutil.execWithRedirect(cmd, args, root=ROOT_PATH) class Firstboot(commands.firstboot.FC3_Firstboot): + def setup(self, *args): + # firstboot should be disabled by default after kickstart installations + if flags.automatedInstall and not self.seen: + self.firstboot = FIRSTBOOT_SKIP + def execute(self, *args): action = "enable" -- 1.7.11.7

2 1

[master][PATCH] Fix typo introduced in refactorization (#1005511)
by Vratislav Podzimek 10 Sep '13

10 Sep '13

Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- 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 dafd7c0..393e52a 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -549,7 +549,7 @@ class ContainerDialog(GUIObject): self.encrypted = self._encryptCheckbutton.get_active() self.size_policy = size - self.builder._error_label.set_text("") + self._error_label.set_text("") self.window.destroy() def run(self): -- 1.7.11.7

2 1

[initial-setup] Set up translations properly
by Vratislav Podzimek 10 Sep '13

10 Sep '13

Patches that make translations in the build process and runtime of the Initial Setup work properly. Vratislav Podzimek (2): Make handling translations easier Make translations work .tx/config | 8 +-- MANIFEST.in | 3 +- Makefile | 20 +++++++- initial-setup.spec | 4 +- initial_setup/gui/gui.py | 5 +- initial_setup/tui/hubs/initial_setup_hub.py | 5 +- initial_setup/tui/tui.py | 5 +- locale/cs_CZ/LC_MESSAGES/initial-setup.po | 27 ---------- locale/initial-setup.pot | 26 ---------- po/Makefile | 77 +++++++++++++++++++++++++++++ po/initial-setup.pot | 41 +++++++++++++++ setup.py | 11 ----- 12 files changed, 153 insertions(+), 79 deletions(-) delete mode 100644 locale/cs_CZ/LC_MESSAGES/initial-setup.po delete mode 100644 locale/initial-setup.pot create mode 100644 po/Makefile create mode 100644 po/initial-setup.pot -- 1.8.3.1

2 3

[master][PATCH] Remove magic from the passphrase dialog
by Vratislav Podzimek 10 Sep '13

10 Sep '13

Playing with sensitivity and jumping between widgets based on equality of the password and confirmation entries is confusing and may cause problems. The confirmation entry cannot be clicked when the password entry is being eddited, only TAB works for switching into it. And jumping to the save button when the confirmation entry equals the password entry may lead in an incomplete password entered and "confirmed". Hitting ENTER in one of the entries may click the Save button if both entries have the same string. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/lib/passphrase.glade | 2 ++ pyanaconda/ui/gui/spokes/lib/passphrase.py | 29 +++++++++------------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.glade b/pyanaconda/ui/gui/spokes/lib/passphrase.glade index ccff718..731019a 100644 --- a/pyanaconda/ui/gui/spokes/lib/passphrase.glade +++ b/pyanaconda/ui/gui/spokes/lib/passphrase.glade @@ -117,6 +117,7 @@ <property name="width_chars">32</property> <signal name="changed" handler="on_passphrase_changed" swapped="no"/> <signal name="focus-out-event" handler="on_passphrase_editing_done" swapped="no"/> + <signal name="activate" handler="on_entry_activated" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -149,6 +150,7 @@ <property name="invisible_char">●</property> <property name="width_chars">32</property> <signal name="changed" handler="on_confirm_changed" swapped="no"/> + <signal name="activate" handler="on_entry_activated" swapped="no"/> <signal name="focus-out-event" handler="on_confirm_editing_done" swapped="no"/> </object> <packing> diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py index 83379ef..bc7251b 100644 --- a/pyanaconda/ui/gui/spokes/lib/passphrase.py +++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py @@ -84,7 +84,6 @@ class PassphraseDialog(GUIObject): if not self.passphrase: self._save_button.set_sensitive(False) - self._confirm_entry.set_sensitive(False) self._passphrase_entry.set_text(self.passphrase) self._confirm_entry.set_text(self.passphrase) @@ -129,37 +128,28 @@ class PassphraseDialog(GUIObject): def on_passphrase_changed(self, entry): self._update_passphrase_strength() - if self._confirm_entry.get_text(): - self._confirm_entry.set_text("") + if not self._save_button.get_sensitive() and \ + entry.get_text() == self._confirm_entry.get_text(): self._set_entry_icon(self._confirm_entry, "", "") + self._save_button.set_sensitive(True) + else: + self._save_button.set_sensitive(False) if not self._pwq_error: self._set_entry_icon(entry, "", "") - self._save_button.set_sensitive(False) - self._confirm_entry.set_sensitive(False) - def on_passphrase_editing_done(self, entry, *args): - sensitive = True if self._pwq_error: icon = "gtk-dialog-error" msg = _(ERROR_WEAK) % self._pwq_error sensitive = False self._set_entry_icon(entry, icon, msg) - self._confirm_entry.set_sensitive(sensitive) - if sensitive: - self._confirm_entry.grab_focus() - - return True - def on_confirm_changed(self, entry): if not self._save_button.get_sensitive() and \ entry.get_text() == self._passphrase_entry.get_text(): - self._save_button.set_sensitive(True) - self._save_button.grab_focus() - self._save_button.grab_default() self._set_entry_icon(entry, "", "") + self._save_button.set_sensitive(True) def on_confirm_editing_done(self, entry, *args): passphrase = self._passphrase_entry.get_text() @@ -169,10 +159,11 @@ class PassphraseDialog(GUIObject): msg = ERROR_NOT_MATCHING self._set_entry_icon(entry, icon, _(msg)) self._save_button.set_sensitive(False) - else: - self._save_button.grab_focus() - self._save_button.grab_default() def on_save_clicked(self, button): self.passphrase = self._passphrase_entry.get_text() + def on_entry_activated(self, entry): + if self._save_button.get_sensitive() and \ + entry.get_text() == self._passphrase_entry.get_text(): + self._save_button.emit("clicked") -- 1.7.11.7

3 4

[master][PATCH] Don't pass extra arguments to LangLocaleHandler.__init__()
by Vratislav Podzimek 10 Sep '13

10 Sep '13

It doesn't expect nor need them. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/langsupport.py | 2 +- pyanaconda/ui/gui/spokes/welcome.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/langsupport.py b/pyanaconda/ui/gui/spokes/langsupport.py index dc6b815..776791e 100644 --- a/pyanaconda/ui/gui/spokes/langsupport.py +++ b/pyanaconda/ui/gui/spokes/langsupport.py @@ -47,7 +47,7 @@ class LangsupportSpoke(LangLocaleHandler, NormalSpoke): def __init__(self, *args, **kwargs): NormalSpoke.__init__(self, *args, **kwargs) - LangLocaleHandler.__init__(self, *args, **kwargs) + LangLocaleHandler.__init__(self) self._selected_locales = set() def initialize(self): diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py index 85352d6..79efdd2 100644 --- a/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py @@ -54,7 +54,7 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke): def __init__(self, *args, **kwargs): StandaloneSpoke.__init__(self, *args, **kwargs) - LangLocaleHandler.__init__(self, *args, **kwargs) + LangLocaleHandler.__init__(self) self._xklwrapper = keyboard.XklWrapper.get_instance() self._origStrings = {} -- 1.7.11.7

2 1

[pykickstart] Reset method seen attrs when switching method (#1004889)
by Brian C. Lane 10 Sep '13

10 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> The method initially gets set to cdrom, it can then be switched to another method via UI or when falling back to closest mirror if a repo isn't found. This would result in .seen to be set on multiple methods, and since .cdrom.seen was checked first it would be used for the attributes -- some of which don't exist. This clears the .seen attr when switching methods or setting it to None. It also fixes a problem where None was being returned for too many attrs which caused problems with the internal operations of copy.copy used by the software spoke to detect changes from the previous method settings. Only return None if the name is "method" otherwise pass it through to the superclass' __getattr__ --- pykickstart/commands/method.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pykickstart/commands/method.py b/pykickstart/commands/method.py index 1e0cf90..0dbcb52 100644 --- a/pykickstart/commands/method.py +++ b/pykickstart/commands/method.py @@ -28,6 +28,13 @@ class FC3_Method(KickstartCommand): internals = ["method", "writePriority", "currentCmd", "currentLine", "handler", "lineno", "seen"] + _methods = ["cdrom", "harddrive", "nfs", "url"] + + def _clear_seen(self): + """ Reset all the method's seen attrs to False""" + for method in self._methods: + setattr(getattr(self.handler, method), "seen", False) + def __getattr__(self, name): if self.handler.cdrom.seen: if name == "method": @@ -49,11 +56,15 @@ class FC3_Method(KickstartCommand): return "url" else: return getattr(self.handler.url, name) - else: + elif name == "method": return None + else: + return KickstartCommand.__getattr__(self, name) def __setattr__(self, name, value): if name in self.internals: + if name == "method": + self._clear_seen() if name == "method" and value == "cdrom": setattr(self.handler.cdrom, "seen", True) elif name == "method" and value == "harddrive": @@ -88,6 +99,8 @@ class F19_Method(FC3_Method): removedKeywords = FC3_Method.removedKeywords removedAttrs = FC3_Method.removedAttrs + _methods = FC3_Method._methods + ["liveimg"] + def __getattr__(self, name): if self.handler.liveimg.seen: if name == "method": @@ -99,6 +112,8 @@ class F19_Method(FC3_Method): def __setattr__(self, name, value): if name in self.internals: + if name == "method": + self._clear_seen() if name == "method" and value == "liveimg": setattr(self.handler.liveimg, "seen", True) else: -- 1.8.3.1

2 1

[PATCH] Get rid of the now-unused new_firmware variable.
by Chris Lumens 09 Sep '13

09 Sep '13

--- pyanaconda/packaging/__init__.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 155d8dd..48d4cbd 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -540,8 +540,6 @@ class Payload(object): def _copyDriverDiskFiles(self): import glob - new_firmware = False - # Multiple driver disks may be loaded, so we need to glob for all # the firmware files in the common DD firmware directory for f in glob.glob(DD_FIRMWARE+"/*"): @@ -549,8 +547,6 @@ class Payload(object): shutil.copyfile(f, "%s/lib/firmware/" % ROOT_PATH) except IOError as e: log.error("Could not copy firmware file %s: %s", f, e.strerror) - else: - new_firmware = True #copy RPMS for d in glob.glob(DD_RPMS): -- 1.8.1.2

2 1

[PATCH] Fix handling of flexible specs in onpart for member devices. (#1004885)
by David Lehman 09 Sep '13

09 Sep '13

Short version: don't assume onPart identifier is a name/path. Longer version: If an existing pv was specified using --onpart=UUID=<uuid> the immediate onpart resolution worked, but the volgroup would then fail to resolve the pv.xxx to a device because it assumed the onpart data was a name. --- pyanaconda/kickstart.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index e3f8895..d6baaaa 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -314,7 +314,7 @@ class BTRFSData(commands.btrfs.F17_BTRFSData): # if using --onpart, use original device member_name = ksdata.onPart.get(member, member) if member_name: - dev = devicetree.getDeviceByName(member_name) or lookupAlias(devicetree, member) + dev = devicetree.getDeviceByName(udev.udev_resolve_devspec(member_name)) or lookupAlias(devicetree, member) if not dev: dev = devicetree.resolveDevice(member) @@ -1131,7 +1131,7 @@ class RaidData(commands.raid.F18_RaidData): for member in self.members: # if member is using --onpart, use original device mem = ksdata.onPart.get(member, member) - dev = devicetree.getDeviceByName(mem) or lookupAlias(devicetree, mem) + dev = devicetree.getDeviceByName(udev.udev_resolve_devspec(mem)) or lookupAlias(devicetree, mem) if dev and dev.format.type == "luks": try: dev = devicetree.getChildren(dev)[0] @@ -1350,7 +1350,7 @@ class VolGroupData(commands.volgroup.FC16_VolGroupData): for pv in self.physvols: # if pv is using --onpart, use original device pv = ksdata.onPart.get(pv, pv) - dev = devicetree.getDeviceByName(pv) or lookupAlias(devicetree, pv) + dev = devicetree.getDeviceByName(udev.udev_resolve_devspec(pv)) or lookupAlias(devicetree, pv) if dev and dev.format.type == "luks": try: dev = devicetree.getChildren(dev)[0] -- 1.8.1.4

2 1

[rhel6-branch] Drop support for ssh protocol version 1 (#1004752)
by Brian C. Lane 09 Sep '13

09 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> In fips mode creation of the protocol 1 key causes it to hang. This removes version 1 support during installation. It has no effect on the installed system. --- anaconda | 1 - scripts/mk-images | 5 ----- 2 files changed, 6 deletions(-) diff --git a/anaconda b/anaconda index 0e566f3..09d11c2 100755 --- a/anaconda +++ b/anaconda @@ -459,7 +459,6 @@ def startSsh(): if not fork_orphan(): os.open("/var/log/lastlog", os.O_RDWR | os.O_CREAT, 0644) ssh_keys = { - 'rsa1':'ssh_host_key', 'rsa':'ssh_host_rsa_key', 'dsa':'ssh_host_dsa_key', } diff --git a/scripts/mk-images b/scripts/mk-images index eb2b26a..2439002 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -475,10 +475,6 @@ EOF # key generation takes ages on s390, you really don't want this # for every installation attempt. These are NOT the keys of the # installed system! - echo -n "Generating SSH1 RSA host key: " - /usr/bin/ssh-keygen -q -t rsa1 -f $MBD_DIR/etc/ssh/ssh_host_key \ - -C '' -N '' >&/dev/null - echo echo -n "Generating SSH2 RSA host key: " /usr/bin/ssh-keygen -q -t rsa -f $MBD_DIR/etc/ssh/ssh_host_rsa_key \ -C '' -N '' >&/dev/null @@ -494,7 +490,6 @@ EOF cat > $MBD_DIR/etc/ssh/sshd_config.anaconda <<EOF Port 22 -HostKey /etc/ssh/ssh_host_key HostKey /etc/ssh/ssh_host_rsa_key HostKey /etc/ssh/ssh_host_dsa_key PermitRootLogin yes -- 1.8.3.1

2 1

[master/rhel7] Add more details to iso device selector (#971290)
by Brian C. Lane 09 Sep '13

09 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> Add the device path, format and label or uuid to the dropdown. uuid is only shown if there is no label. -- See and example here: http://bcl.fedorapeople.org/images/isofile.png --- pyanaconda/ui/gui/spokes/source.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index 8dd8ba2..e8fb3c5 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -625,7 +625,14 @@ class SourceSpoke(NormalSpoke): active = 0 idx = 0 for dev in potentialHdisoSources(self.storage.devicetree): - store.append([dev, "%s (%s MB)" % (self._sanitize_model(dev.disk.model), int(dev.size))]) + # path model size format type uuid of format + dev_info = { "model" : self._sanitize_model(dev.disk.model), + "path" : dev.path, + "size" : dev.size, + "format": dev.format.name or "", + "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: active = idx added = True -- 1.8.3.1

3 3

[master] Test case fixes
by David Shea 09 Sep '13

09 Sep '13

Some tests were failing, some tests were being skipped, and some tests didn't run with the right paths because automake was setting more environment variables than I thought it would. These patches fix all of that. Hey clumens welcome back we got you a present: ============================================================================ Testsuite summary for anaconda 20.12 ============================================================================ # TOTAL: 3 # PASS: 3 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ============================================================================

3 9

[PATCH] Fix check for device state when reading its IPXConfig (#1001776)
by Radek Vykydal 09 Sep '13

09 Sep '13

Device has to be in ACTIVATED state for IPXConfig to be valid. 1) use a recently added nm module function to get IP configuration, replacing python-dbus with GDBus here. Python-dbus would give us stale value. 2) Don't use get_cached_property of GDBus as it would give us stale value too. Instead use DBus.Properties interface call to get current values. --- pyanaconda/nm.py | 77 ++++++++++++++++++++----------------- pyanaconda/ui/gui/spokes/network.py | 64 +++++++++++------------------- 2 files changed, 63 insertions(+), 78 deletions(-) diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py index 1109d6e..4f0923d 100644 --- a/pyanaconda/nm.py +++ b/pyanaconda/nm.py @@ -73,10 +73,27 @@ def _get_proxy(bus_type=Gio.BusType.SYSTEM, cancellable) return proxy +def _get_property(object_path, prop, interface_name_suffix=""): + interface_name = "org.freedesktop.NetworkManager" + interface_name_suffix + proxy = _get_proxy(object_path=object_path, interface_name="org.freedesktop.DBus.Properties") + args = GLib.Variant('(ss)', (interface_name, prop)) + try: + prop = proxy.call_sync("Get", + args, + Gio.DBusCallFlags.NONE, + DEFAULT_DBUS_TIMEOUT, + None) + except GLib.GError as e: + if "org.freedesktop.DBus.Error.AccessDenied" in e.message: + return None + else: + raise + + return prop.unpack()[0] + def nm_state(): """Return state of NetworkManager""" - proxy = _get_proxy() - return proxy.get_cached_property("State").unpack() + return _get_property("/org/freedesktop/NetworkManager", "State") # FIXME - use just GLOBAL? There is some connectivity checking # for GLOBAL in NM (nm_connectivity_get_connected), not sure if @@ -107,11 +124,11 @@ def nm_devices(): devices = devices.unpack()[0] for device in devices: - proxy = _get_proxy(object_path=device, interface_name="org.freedesktop.NetworkManager.Device") - device_type = proxy.get_cached_property("DeviceType").unpack() + device_type = _get_property(device, "DeviceType", ".Device") if device_type not in supported_device_types: continue - interfaces.append(proxy.get_cached_property("Interface").unpack()) + iface = _get_property(device, "Interface", ".Device") + interfaces.append(iface) return interfaces @@ -120,19 +137,15 @@ def nm_activated_devices(): interfaces = [] - proxy = _get_proxy() - active_connections = proxy.get_cached_property("ActiveConnections").unpack() + active_connections = _get_property("/org/freedesktop/NetworkManager", "ActiveConnections") for ac in active_connections: - proxy = _get_proxy(object_path=ac, interface_name="org.freedesktop.NetworkManager.Connection.Active") - state = proxy.get_cached_property("State") - if not state or state.unpack() != NetworkManager.ActiveConnectionState.ACTIVATED: - continue - devices = proxy.get_cached_property("Devices") - if not devices: + state = _get_property(ac, "State", ".Connection.Active") + if state != NetworkManager.ActiveConnectionState.ACTIVATED: continue - for device in devices.unpack(): - proxy = _get_proxy(object_path=device, interface_name="org.freedesktop.NetworkManager.Device") - interfaces.append(proxy.get_cached_property("Interface").unpack()) + devices = _get_property(ac, "Devices", ".Connection.Active") + for device in devices: + iface = _get_property(device, "Interface", ".Device") + interfaces.append(iface) return interfaces @@ -181,18 +194,14 @@ def nm_device_property(name, prop): raise device = device.unpack()[0] - proxy = _get_proxy(object_path=device, interface_name="org.freedesktop.NetworkManager.Device") - if prop in proxy.get_cached_property_names(): - retval = proxy.get_cached_property(prop).unpack() - else: + retval = _get_property(device, prop, ".Device") + if not retval: # Look in device type based interface interface = _device_type_specific_interface(device) if interface: - proxy = _get_proxy(object_path=device, interface_name=interface) - if prop in proxy.get_cached_property_names(): - retval = proxy.get_cached_property(prop).unpack() - else: + retval = _get_property(device, prop, interface[30:]) + if not retval: raise PropertyNotFoundError(prop) else: raise PropertyNotFoundError(prop) @@ -284,10 +293,10 @@ def nm_device_ip_config(name, version=4): return [] if version == 4: - dbus_iface = "org.freedesktop.NetworkManager.IP4Config" + dbus_iface = ".IP4Config" prop= "Ip4Config" elif version == 6: - dbus_iface = "org.freedesktop.NetworkManager.IP6Config" + dbus_iface = ".IP6Config" prop= "Ip6Config" else: return [] @@ -296,9 +305,7 @@ def nm_device_ip_config(name, version=4): if config == "/": return [] - proxy = _get_proxy(object_path=config, interface_name=dbus_iface) - - addresses = proxy.get_cached_property("Addresses").unpack() + addresses = _get_property(config, "Addresses", dbus_iface) addr_list = [] for addr, prefix, gateway in addresses: # TODO - look for a library function (could have used IPy but byte order!) @@ -310,7 +317,7 @@ def nm_device_ip_config(name, version=4): gateway_str = nm_dbus_ay_to_ipv6(gateway) addr_list.append([addr_str, prefix, gateway_str]) - nameservers = proxy.get_cached_property("Nameservers").unpack() + nameservers = _get_property(config, "Nameservers", dbus_iface) ns_list = [] for ns in nameservers: # TODO - look for a library function @@ -322,7 +329,6 @@ def nm_device_ip_config(name, version=4): return [addr_list, ns_list] - def nm_ntp_servers_from_dhcp(): """Return a list of NTP servers that were specified the reply of the DHCP server or empty list if no NTP servers were returned. @@ -335,16 +341,15 @@ def nm_ntp_servers_from_dhcp(): for device in active_devices: # harvest NTP server addresses from DHCPv4 dhcp4_path = nm_device_property(device, "Dhcp4Config") - dhcp4_proxy = _get_proxy(object_path=dhcp4_path, - interface_name="org.freedesktop.NetworkManager.DHCP4Config") - options = dhcp4_proxy.get_cached_property("Options") - if options and 'ntp_servers' in options.unpack(): + options = _get_property(dhcp4_path, "Options", ".DHCP4Config") + if options and 'ntp_servers' in options: # NTP server addresses returned by DHCP are whitespace delimited - ntp_servers_string = options.unpack()["ntp_servers"] + ntp_servers_string = options["ntp_servers"] for ip in ntp_servers_string.split(" "): ntp_servers.append(ip) # NetworkManager does not request NTP/SNTP options for DHCP6 + print ntp_servers return ntp_servers def _device_settings(name): diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index f7c1275..132c7f2 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -43,7 +43,7 @@ from pyanaconda.ui.gui.utils import gtk_call_once, enlightbox from pyanaconda.ui.common import FirstbootSpokeMixIn from pyanaconda import network -from pyanaconda.nm import nm_activated_devices, nm_device_setting_value, nm_dbus_ay_to_ipv6 +from pyanaconda.nm import nm_device_setting_value, nm_device_ip_config from gi.repository import GLib, GObject, Pango, Gio, NetworkManager, NMClient import dbus @@ -704,12 +704,9 @@ class NetworkControlBox(object): self._refresh_parent_vlanid(device) self._refresh_speed_hwaddr(device, state) self._refresh_ap(device, state) - self._refresh_device_cfg(device, state) + self._refresh_device_cfg(device) - def _refresh_device_cfg(self, device, state): - - if state is None: - state = device.get_state() + def _refresh_device_cfg(self, device): dev_type = device.get_device_type() if dev_type == NetworkManager.DeviceType.ETHERNET: @@ -721,45 +718,28 @@ class NetworkControlBox(object): elif dev_type == NetworkManager.DeviceType.VLAN: dt = "wired" - if state == NetworkManager.DeviceState.ACTIVATED: - ipv4cfg = device.get_ip4_config() - ipv6cfg = device.get_ip6_config() - else: - ipv4cfg = None - ipv6cfg = None - - if ipv4cfg: - addr = socket.inet_ntoa(struct.pack('=L', - ipv4cfg.get_addresses()[0].get_address())) - self._set_device_info_value(dt, "ipv4", addr) - dnss = " ".join(socket.inet_ntoa(struct.pack('=L', addr)) - for addr in ipv4cfg.get_nameservers()) - self._set_device_info_value(dt, "dns", dnss) - gateway = socket.inet_ntoa(struct.pack('=L', - ipv4cfg.get_addresses()[0].get_gateway())) - self._set_device_info_value(dt, "route", gateway) - if dt == "wired": - prefix = ipv4cfg.get_addresses()[0].get_prefix() - nm_utils.nm_utils_ip4_prefix_to_netmask.argtypes = [ctypes.c_uint32] - nm_utils.nm_utils_ip4_prefix_to_netmask.restype = ctypes.c_uint32 - netmask = nm_utils.nm_utils_ip4_prefix_to_netmask(prefix) - netmask = socket.inet_ntoa(struct.pack('=L', netmask)) - self._set_device_info_value(dt, "subnet", netmask) + ipv4cfg = nm_device_ip_config(device.get_iface(), version=4) + ipv6cfg = nm_device_ip_config(device.get_iface(), version=6) + + if ipv4cfg and ipv4cfg[0]: + addr_str, prefix, gateway_str = ipv4cfg[0][0] + netmask_str = network.prefix2netmask(prefix) + dnss_str = " ".join(ipv4cfg[1]) else: - self._set_device_info_value(dt, "ipv4", None) - self._set_device_info_value(dt, "dns", None) - self._set_device_info_value(dt, "route", None) - if dt == "wired": - self._set_device_info_value(dt, "subnet", None) + addr_str = dnss_str = gateway_str = netmask_str = None + self._set_device_info_value(dt, "ipv4", addr_str) + self._set_device_info_value(dt, "dns", dnss_str) + self._set_device_info_value(dt, "route", gateway_str) + if dt == "wired": + self._set_device_info_value(dt, "subnet", netmask_str) - # TODO NM_GI_BUGS - segfaults on get_addres(), get_prefix() addr6_str = "" - if ipv6cfg: - config = dbus.SystemBus().get_object(NM_SERVICE, ipv6cfg.get_path()) - for addr, _prefix, _gw in getNMObjProperty(config, ".IP6Config", "Addresses"): - ipv6_addr = nm_dbus_ay_to_ipv6(addr) - if not ipv6_addr.startswith("fe80:"): - addr6_str += "%s\n" % ipv6_addr + if ipv6cfg and ipv6cfg[0]: + for ipv6addr in ipv6cfg[0]: + addr_str, prefix, gateway_str = ipv6addr + # Do not display link-local addresses + if not addr_str.startswith("fe80:"): + addr6_str += "%s/%d\n" % (addr_str, prefix) self._set_device_info_value(dt, "ipv6", addr6_str.strip() or None) -- 1.7.11.7

2 3

[master] Problematic patch I'm not sure we want to apply
by Vratislav Podzimek 09 Sep '13

09 Sep '13

This patch adds one more step to LiveCD installations -- generating new initrd after the installation. With the DracutHostOnly feature [1] dracut now includes only one keymap to the initrd image which makes the vconsole.keymap boot option not working. Users need the keymap they used in the installation in the initrd, especially when they use LUKS. However, to save 3 MB (summed size of all keymaps) in the initrd size, all live installations would generate initrd twice -- when the kernel package is installed and at the end of the installation. Vratislav Podzimek (1): Regenerate initrd on live installations (#994180) pyanaconda/install.py | 19 +++++++++++++++---- pyanaconda/iutil.py | 5 +++++ 2 files changed, 20 insertions(+), 4 deletions(-) -- 1.7.11.7

2 6

[blivet][rhel7-branch]
by David Lehman 06 Sep '13

06 Sep '13

These are all pretty simple patches that fix bugs. Patch 3 is BS but we've supported it in the past so we're stuck with it.

2 4

[PATCH] Don't set "date of last password change" /etc/shadow field (#985572)
by Vratislav Podzimek 06 Sep '13

06 Sep '13

From: Hans de Goede <hdegoede(a)redhat.com> Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/users.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyanaconda/users.py b/pyanaconda/users.py index ba5427a..e831122 100644 --- a/pyanaconda/users.py +++ b/pyanaconda/users.py @@ -335,6 +335,8 @@ class Users: else: password = cryptPassword(kwargs["password"], algo=kwargs.get("algo", None)) self.admin.setpassUser(userEnt, password, True) + userEnt.set(libuser.SHADOWLASTCHANGE, "") + self.admin.modifyUser(userEnt) elif pw == "": # Setup the account with *NO* password self.admin.unlockUser(userEnt) @@ -410,6 +412,7 @@ class Users: if lock: self.admin.lockUser(user) + user.set(libuser.SHADOWLASTCHANGE, "") self.admin.modifyUser(user) def setRootPassword(self, password, isCrypted=False, isLocked=False, algo=None): -- 1.7.11.7

2 1

[master] Automake changes
by David Shea 06 Sep '13

06 Sep '13

Here's a handful of tweaks to the autotools files to (hopefully) make things run a little more smoothly and to avoid having to keep track of files that we don't have to. The most immediately useful is patch 7, which changes the test scripts so that they can be run from any working directory.

2 10

[initial-setup][PATCH] Read /etc/system-release to get product title (#1000426)
by Vratislav Podzimek 06 Sep '13

06 Sep '13

The /etc/system-release file contains a release name that we want to display in the UI. For GUI we can use just the product title because the string "INITIAL SETUP" is shown in the top-left corner. For TUI we should inform user that this is an initial setup of the system. Also rename the hub files not to clash with the the Python package name. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- initial_setup/gui/gui.py | 13 +++--- initial_setup/gui/hubs/__init__.py | 2 +- initial_setup/gui/hubs/initial_setup.py | 60 ---------------------------- initial_setup/gui/hubs/initial_setup_hub.py | 60 ++++++++++++++++++++++++++++ initial_setup/product.py | 31 +++++++++++++++ initial_setup/tui/hubs/__init__.py | 2 +- initial_setup/tui/hubs/initial_setup.py | 55 -------------------------- initial_setup/tui/hubs/initial_setup_hub.py | 61 +++++++++++++++++++++++++++++ initial_setup/tui/tui.py | 13 +++--- 9 files changed, 164 insertions(+), 133 deletions(-) delete mode 100644 initial_setup/gui/hubs/initial_setup.py create mode 100644 initial_setup/gui/hubs/initial_setup_hub.py create mode 100644 initial_setup/product.py delete mode 100644 initial_setup/tui/hubs/initial_setup.py create mode 100644 initial_setup/tui/hubs/initial_setup_hub.py diff --git a/initial_setup/gui/gui.py b/initial_setup/gui/gui.py index 24e5a27..3afe5da 100644 --- a/initial_setup/gui/gui.py +++ b/initial_setup/gui/gui.py @@ -1,5 +1,5 @@ from pyanaconda.ui.gui import QuitDialog, GUIObject, GraphicalUserInterface -#from .product import productName, productVersion +from initial_setup.product import product_title, is_final from .hubs import InitialSetupMainHub from pyanaconda.ui.gui.spokes import StandaloneSpoke import pyanaconda.ui.gui.spokes @@ -13,27 +13,24 @@ from di import inject, usesclassinject _ = lambda t: t N_ = lambda t: t -productTitle = lambda: "Initial Setup of Fedora" -isFinal = lambda: False - class InitialSetupQuitDialog(QuitDialog): MESSAGE = N_("Are you sure you want to quit the configuration process?\n" "You might end up with unusable system if you do.") -@inject(Gdk, productTitle = productTitle, isFinal = isFinal) +@inject(Gdk, product_title = product_title, is_final = is_final) class InitialSetupGraphicalUserInterface(GraphicalUserInterface): """This is the main Gtk based firstboot interface. It inherits from anaconda to make the look & feel as similar as possible. """ screenshots_directory = "/tmp/initial-setup-screenshots" - + @usesclassinject def __init__(self, storage, payload, instclass): GraphicalUserInterface.__init__(self, storage, payload, instclass, - productTitle, isFinal, + product_title, is_final, quitDialog = InitialSetupQuitDialog) - + def _list_hubs(self): return [InitialSetupMainHub] diff --git a/initial_setup/gui/hubs/__init__.py b/initial_setup/gui/hubs/__init__.py index 5d166d6..39d8b13 100644 --- a/initial_setup/gui/hubs/__init__.py +++ b/initial_setup/gui/hubs/__init__.py @@ -1 +1 @@ -from .initial_setup import InitialSetupMainHub +from .initial_setup_hub import InitialSetupMainHub diff --git a/initial_setup/gui/hubs/initial_setup.py b/initial_setup/gui/hubs/initial_setup.py deleted file mode 100644 index f966782..0000000 --- a/initial_setup/gui/hubs/initial_setup.py +++ /dev/null @@ -1,60 +0,0 @@ -from pyanaconda.ui.gui.hubs import Hub -from pyanaconda.ui.gui.spokes import Spoke -from pyanaconda.ui.common import collect -import os - -__all__ = ["InitialSetupMainHub"] - -def collect_spokes(mask_paths): - """Return a list of all spoke subclasses that should appear for a given - category. Look for them in files imported as module_path % basename(f) - - :param mask_paths: list of mask, path tuples to search for classes - :type mask_paths: list of (mask, path) - - :return: list of Spoke classes belonging to category - :rtype: list of Spoke classes - - """ - spokes = [] - for mask, path in mask_paths: - spokes.extend(collect(mask, path, - lambda obj: issubclass(obj, Spoke) and obj.should_run("firstboot", None))) - - print spokes - return spokes - - -class InitialSetupMainHub(Hub): - uiFile = "initial_setup.glade" - builderObjects = ["summaryWindow"] - mainWidgetName = "summaryWindow" - - def _collectCategoriesAndSpokes(self): - """collects categories and spokes to be displayed on this Hub - - :return: dictionary mapping category class to list of spoke classes - :rtype: dictionary[category class] -> [ list of spoke classes ] - """ - - ret = {} - - # Collect all the categories this hub displays, then collect all the - # spokes belonging to all those categories. - candidate_spokes = collect_spokes(self.paths["spokes"]) - spokes = [spoke for spoke in candidate_spokes \ - if spoke.should_run("firstboot", self.data)] - - for spoke in spokes: - ret.setdefault(spoke.category, []) - ret[spoke.category].append(spoke) - - return ret - - @property - def continueButton(self): - return self.builder.get_object("continueButton") - - @property - def quitButton(self): - return self.builder.get_object("quitButton") diff --git a/initial_setup/gui/hubs/initial_setup_hub.py b/initial_setup/gui/hubs/initial_setup_hub.py new file mode 100644 index 0000000..d0ac15b --- /dev/null +++ b/initial_setup/gui/hubs/initial_setup_hub.py @@ -0,0 +1,60 @@ +from pyanaconda.ui.gui.hubs import Hub +from pyanaconda.ui.gui.spokes import Spoke +from pyanaconda.ui.common import collect +import os + +__all__ = ["InitialSetupMainHub"] + +def collect_spokes(mask_paths): + """Return a list of all spoke subclasses that should appear for a given + category. Look for them in files imported as module_path % basename(f) + + :param mask_paths: list of mask, path tuples to search for classes + :type mask_paths: list of (mask, path) + + :return: list of Spoke classes belonging to category + :rtype: list of Spoke classes + + """ + spokes = [] + for mask, path in mask_paths: + spokes.extend(collect(mask, path, + lambda obj: issubclass(obj, Spoke) and obj.should_run("firstboot", None))) + + print spokes + return spokes + + +class InitialSetupMainHub(Hub): + uiFile = "initial_setup.glade" + builderObjects = ["summaryWindow"] + mainWidgetName = "summaryWindow" + + def _collectCategoriesAndSpokes(self): + """collects categories and spokes to be displayed on this Hub + + :return: dictionary mapping category class to list of spoke classes + :rtype: dictionary[category class] -> [ list of spoke classes ] + """ + + ret = {} + + # Collect all the categories this hub displays, then collect all the + # spokes belonging to all those categories. + candidate_spokes = collect_spokes(self.paths["spokes"]) + spokes = [spoke for spoke in candidate_spokes \ + if spoke.should_run("firstboot", self.data)] + + for spoke in spokes: + ret.setdefault(spoke.category, []) + ret[spoke.category].append(spoke) + + return ret + + @property + def continueButton(self): + return self.builder.get_object("continueButton") + + @property + def quitButton(self): + return self.builder.get_object("quitButton") diff --git a/initial_setup/product.py b/initial_setup/product.py new file mode 100644 index 0000000..40cf45d --- /dev/null +++ b/initial_setup/product.py @@ -0,0 +1,31 @@ +"""Module providing information about the installed product.""" + +RELEASE_STRING_FILE = "/etc/system-release" + +def product_title(): + """ + Get product title. + + :return: product title + :rtype: str + + """ + + try: + with open(RELEASE_STRING_FILE, "r") as fobj: + title = fobj.readline().strip() + + return title + except IOError: + return "" + +def is_final(): + """ + Whether it is a final release of the product or not. + + :rtype: bool + + """ + + # doesn't really matter for the Initial Setup + return True diff --git a/initial_setup/tui/hubs/__init__.py b/initial_setup/tui/hubs/__init__.py index 5d166d6..39d8b13 100644 --- a/initial_setup/tui/hubs/__init__.py +++ b/initial_setup/tui/hubs/__init__.py @@ -1 +1 @@ -from .initial_setup import InitialSetupMainHub +from .initial_setup_hub import InitialSetupMainHub diff --git a/initial_setup/tui/hubs/initial_setup.py b/initial_setup/tui/hubs/initial_setup.py deleted file mode 100644 index a8521ad..0000000 --- a/initial_setup/tui/hubs/initial_setup.py +++ /dev/null @@ -1,55 +0,0 @@ -from pyanaconda.ui.tui.hubs import TUIHub -from pyanaconda.ui.tui.spokes import TUISpoke -from pyanaconda.ui.common import collect -import os - -__all__ = ["InitialSetupMainHub"] - -# localization -_ = lambda t: t -N_ = lambda t: t - -def collect_spokes(mask_paths): - """Return a list of all spoke subclasses that should appear for a given - category. Look for them in files imported as module_path % basename(f) - - :param mask_paths: list of mask, path tuples to search for classes - :type mask_paths: list of (mask, path) - - :return: list of Spoke classes belonging to category - :rtype: list of Spoke classes - - """ - spokes = [] - for mask, path in mask_paths: - spokes.extend(collect(mask, path, - lambda obj: issubclass(obj, Spoke) and obj.should_run("firstboot", None))) - - print spokes - return spokes - - -class InitialSetupMainHub(TUIHub): - categories = ["password", "localization"] - title = _("Initial setup of Fedora") - - def _collectCategoriesAndSpokes(self): - """collects categories and spokes to be displayed on this Hub - - :return: dictionary mapping category class to list of spoke classes - :rtype: dictionary[category class] -> [ list of spoke classes ] - """ - - ret = {} - - # Collect all the categories this hub displays, then collect all the - # spokes belonging to all those categories. - candidate_spokes = collect_spokes(self.paths["spokes"]) - spokes = [spoke for spoke in candidate_spokes \ - if spoke.should_run("firstboot", self.data)] - - for spoke in spokes: - ret.setdefault(spoke.category, []) - ret[spoke.category].append(spoke) - - return ret diff --git a/initial_setup/tui/hubs/initial_setup_hub.py b/initial_setup/tui/hubs/initial_setup_hub.py new file mode 100644 index 0000000..6316179 --- /dev/null +++ b/initial_setup/tui/hubs/initial_setup_hub.py @@ -0,0 +1,61 @@ +from pyanaconda.ui.tui.hubs import TUIHub +from pyanaconda.ui.tui.spokes import TUISpoke +from pyanaconda.ui.common import collect +from initial_setup import product +import os + +__all__ = ["InitialSetupMainHub"] + +# localization +_ = lambda t: t +N_ = lambda t: t + +def collect_spokes(mask_paths): + """Return a list of all spoke subclasses that should appear for a given + category. Look for them in files imported as module_path % basename(f) + + :param mask_paths: list of mask, path tuples to search for classes + :type mask_paths: list of (mask, path) + + :return: list of Spoke classes belonging to category + :rtype: list of Spoke classes + + """ + spokes = [] + for mask, path in mask_paths: + spokes.extend(collect(mask, path, + lambda obj: issubclass(obj, Spoke) and obj.should_run("firstboot", None))) + + print spokes + return spokes + + +class InitialSetupMainHub(TUIHub): + categories = ["password", "localization"] + + prod_title = product.product_title() + if prod_title: + title = _("Initial setup of %(product)s") % {"product": prod_title} + else: + title = _("Initial setup") + + def _collectCategoriesAndSpokes(self): + """collects categories and spokes to be displayed on this Hub + + :return: dictionary mapping category class to list of spoke classes + :rtype: dictionary[category class] -> [ list of spoke classes ] + """ + + ret = {} + + # Collect all the categories this hub displays, then collect all the + # spokes belonging to all those categories. + candidate_spokes = collect_spokes(self.paths["spokes"]) + spokes = [spoke for spoke in candidate_spokes \ + if spoke.should_run("firstboot", self.data)] + + for spoke in spokes: + ret.setdefault(spoke.category, []) + ret[spoke.category].append(spoke) + + return ret diff --git a/initial_setup/tui/tui.py b/initial_setup/tui/tui.py index 14b5af2..05cbd2c 100644 --- a/initial_setup/tui/tui.py +++ b/initial_setup/tui/tui.py @@ -1,5 +1,5 @@ from pyanaconda.ui.tui import TextUserInterface -#from .product import productName, productVersion +from initial_setup.product import product_title, is_final from .hubs import InitialSetupMainHub from pyanaconda.ui.tui.spokes import StandaloneSpoke import pyanaconda.ui.tui.spokes @@ -12,25 +12,22 @@ from di import inject, usesclassinject _ = lambda t: t N_ = lambda t: t -productTitle = lambda: "Initial Setup of Fedora" -isFinal = lambda: False - QUIT_MESSAGE = N_("Are you sure you want to quit the configuration process?\n" "You might end up with unusable system if you do.") -@inject(productTitle = productTitle, isFinal = isFinal) +@inject(product_title = product_title, is_final = is_final) class InitialSetupTextUserInterface(TextUserInterface): """This is the main text based firstboot interface. It inherits from anaconda to make the look & feel as similar as possible. """ ENVIRONMENT = "firstboot" - + @usesclassinject def __init__(self, storage, payload, instclass): TextUserInterface.__init__(self, storage, payload, instclass, - productTitle, isFinal, quitMessage = QUIT_MESSAGE) - + product_title, is_final, quitMessage = QUIT_MESSAGE) + def _list_hubs(self): return [InitialSetupMainHub] -- 1.7.11.7

4 11

[master][PATCH] Let users configure keyboard via anaconda in live installations (#1002533)
by Vratislav Podzimek 06 Sep '13

06 Sep '13

Setting up keyboard layouts for both the installation process and the installed system is a complicated and confusing task. Because the default environments don't show the layout indicator and have keyboard configuration hidden in some menus, we may let users configure keyboard layouts via anaconda. If somebody configures keyboard on their own and the anaconda's configuration for the installed system is different, we should warn them and make them visit the Keyboard spoke to confirm the configuration. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/flags.py | 7 +++++-- pyanaconda/keyboard.py | 26 ++++++++++++++++++++++++++ pyanaconda/ui/gui/spokes/keyboard.py | 21 ++++++++++++++------- pyanaconda/ui/gui/spokes/welcome.py | 4 ++-- 4 files changed, 47 insertions(+), 11 deletions(-) diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py index 07e5e95..e79f502 100644 --- a/pyanaconda/flags.py +++ b/pyanaconda/flags.py @@ -180,16 +180,19 @@ class BootArgs(OrderedDict): result = False # XXX: should noarg=off -> True? return result -def can_touch_runtime_system(msg): +def can_touch_runtime_system(msg, ignore_live=False): """ Guard that should be used before doing actions that modify runtime system. :param msg: message to be logged in case that runtime system cannot be touched + :type msg: str + :param ignore_live: whether to ignore liveCD installations (can touch liveCD system) + :type ignore_live: bool :rtype: bool """ - if flags.livecdInstall: + if flags.livecdInstall and not ignore_live: log.info("Not doing '%s' in live installation", msg) return False diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py index 24d10bb..934b701 100644 --- a/pyanaconda/keyboard.py +++ b/pyanaconda/keyboard.py @@ -500,6 +500,32 @@ class XklWrapper(object): self._switching_options.append(name) self.switch_to_show_str[name] = desc.encode("utf-8") + def get_current_layout(self): + """ + Get current activated X layout and variant + + :return: current activated X layout and variant (e.g. "cz (qwerty)") + + """ + # ported from the widgets/src/LayoutIndicator.c code + + self._engine.start_listen(Xkl.EngineListenModes.TRACK_KEYBOARD_STATE) + state = self._engine.get_current_state() + cur_group = state.group + num_groups = self._engine.get_num_groups() + + # BUG?: if the last layout in the list is activated and removed, + # state.group may be equal to n_groups + if cur_group >= num_groups: + cur_group = num_groups - 1; + + layout = self._rec.layouts[cur_group] + variant = self._rec.variants[cur_group] + + self._engine.stop_listen(Xkl.EngineListenModes.TRACK_KEYBOARD_STATE) + + return _join_layout_variant(layout, variant) + def get_available_layouts(self): """A generator yielding layouts (no need to store them as a bunch)""" diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py index 1e5cb3f..5782666 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.py +++ b/pyanaconda/ui/gui/spokes/keyboard.py @@ -264,6 +264,7 @@ class KeyboardSpoke(NormalSpoke): def __init__(self, *args): NormalSpoke.__init__(self, *args) self._remove_last_attempt = False + self._confirmed = False self._xkl_wrapper = keyboard.XklWrapper.get_instance() self._upButton = self.builder.get_object("upButton") @@ -272,18 +273,24 @@ class KeyboardSpoke(NormalSpoke): self._previewButton = self.builder.get_object("previewButton") def apply(self): + # the user has confirmed (seen) the configuration + self._confirmed = True + # Clear and repopulate self.data with actual values self.data.keyboard.x_layouts = list() self.data.keyboard.seen = True for row in self._store: self.data.keyboard.x_layouts.append(row[0]) - # FIXME: Set the keyboard layout here, too. @property def completed(self): if flags.flags.automatedInstall and not self.data.keyboard.seen: return False + elif not self._confirmed and self._xkl_wrapper.get_current_layout() != self.data.keyboard.x_layouts[0]: + # the currently activated layout is a different one from the + # installed system's default + return False else: return True @@ -296,7 +303,7 @@ class KeyboardSpoke(NormalSpoke): NormalSpoke.initialize(self) if flags.can_touch_runtime_system("hide runtime keyboard configuration " - "warning"): + "warning", ignore_live=True): self.builder.get_object("warningBox").hide() # We want to store layouts' names but show layouts as @@ -314,7 +321,7 @@ class KeyboardSpoke(NormalSpoke): self._layoutSwitchLabel = self.builder.get_object("layoutSwitchLabel") - if not flags.can_touch_runtime_system("test X layouts"): + if not flags.can_touch_runtime_system("test X layouts", ignore_live=True): # Disable area for testing layouts as we cannot make # it work without modifying runtime system @@ -352,7 +359,7 @@ class KeyboardSpoke(NormalSpoke): def _addLayout(self, store, name): # first try to add the layout - if flags.can_touch_runtime_system("add runtime X layout"): + if flags.can_touch_runtime_system("add runtime X layout", ignore_live=True): self._xkl_wrapper.add_layout(name) # valid layout, append it to the store @@ -365,7 +372,7 @@ class KeyboardSpoke(NormalSpoke): """ - if flags.can_touch_runtime_system("remove runtime X layout"): + if flags.can_touch_runtime_system("remove runtime X layout", ignore_live=True): self._xkl_wrapper.remove_layout(store[itr][0]) store.remove(itr) @@ -449,7 +456,7 @@ class KeyboardSpoke(NormalSpoke): return store.swap(cur, prev) - if flags.can_touch_runtime_system("reorder runtime X layouts"): + if flags.can_touch_runtime_system("reorder runtime X layouts", ignore_live=True): self._flush_layouts_to_X() if not store.iter_previous(cur): @@ -473,7 +480,7 @@ class KeyboardSpoke(NormalSpoke): return store.swap(cur, nxt) - if flags.can_touch_runtime_system("reorder runtime X layouts"): + if flags.can_touch_runtime_system("reorder runtime X layouts", ignore_live=True): self._flush_layouts_to_X() if activate_default: diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py index 5bd8c8a..49f2c06 100644 --- a/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py @@ -120,14 +120,14 @@ class WelcomeLanguageSpoke(StandaloneSpoke): new_layouts = ["us"] self.data.keyboard.x_layouts = new_layouts - if flags.can_touch_runtime_system("replace runtime X layouts"): + if flags.can_touch_runtime_system("replace runtime X layouts", ignore_live=True): self._xklwrapper.replace_layouts(new_layouts) if len(new_layouts) >= 2 and not self.data.keyboard.switch_options: #initialize layout switching if needed self.data.keyboard.switch_options = ["grp:alt_shift_toggle"] - if flags.can_touch_runtime_system("init layout switching"): + if flags.can_touch_runtime_system("init layout switching", ignore_live=True): self._xklwrapper.set_switching_options(["grp:alt_shift_toggle"]) # activate the first (language-default) layout instead of the # 'us' one -- 1.7.11.7

2 2

[master/rhel7] Only ignore missing packages entries (#983316)
by Brian C. Lane 06 Sep '13

06 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> Only ignore missing packages listed in %packages, do not ignore missing dependencies -- the install will not work if we do. Also add some debugging output from buildTransaction. Resolves: rhbz#983316 --- pyanaconda/packaging/yumpayload.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 4926e96..5c9bbc1 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -1445,6 +1445,7 @@ reposdir=%s # check dependencies log.info("checking dependencies") (code, msgs) = self._yum.buildTransaction(unfinished_transactions_check=False) + log.debug("buildTransaction = (%s, %s)" % (code, msgs)) self._removeTxSaveFile() if code == 0: # empty transaction? @@ -1452,8 +1453,6 @@ reposdir=%s elif code == 2: # success log.debug("success") - elif self.data.packages.handleMissing == KS_MISSING_IGNORE: - log.debug("ignoring missing due to ks config") else: for msg in msgs: log.warning(msg) -- 1.8.3.1

2 1

[PATCH] Fix a string that was modified before translation (#1004960)
by David Shea 05 Sep '13

05 Sep '13

--- pyanaconda/ui/tui/spokes/network.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/ui/tui/spokes/network.py b/pyanaconda/ui/tui/spokes/network.py index b44b586..cdd9209 100644 --- a/pyanaconda/ui/tui/spokes/network.py +++ b/pyanaconda/ui/tui/spokes/network.py @@ -262,7 +262,7 @@ class ConfigureNetworkSpoke(EditTUISpoke): category = "network" edit_fields = [ - Entry(_('IPv4 address or %s for DHCP' % '"dhcp"'), "ip", + Entry(_('IPv4 address or %s for DHCP') % '"dhcp"', "ip", re.compile("^" + IPV4_PATTERN_WITHOUT_ANCHORS + "|dhcp$"), True), Entry(_("IPv4 netmask"), "netmask", re.compile("^" + IPV4_PATTERN_WITHOUT_ANCHORS + "$"), True), Entry(_("IPv4 gateway"), "gateway", re.compile("^" + IPV4_PATTERN_WITHOUT_ANCHORS + "$"), True), -- 1.8.3.1

2 1

[PATCH master] Fix crash on LiveCD if network is configured before installing (#1002373)
by Radek Vykydal 05 Sep '13

05 Sep '13

On LiveCD if network is configured before starting installation, the connection is saved into ifcfg file (ifcfg-Wired_connection_1) and 1) instead of ignoring it, the file was updated with our id and onboot value in dumpMissingDefaultIfcfgs in (frequent) case of only one wired device 2) the ifcfg file for the device was expected to be named using device name eg ifcfg-ens3 in setNetworkOnbootDefault => traceback This is a moderate fix for Alpha. I am going to come with bigger patch cleaning up ifcfg files handling. --- pyanaconda/installclasses/fedora.py | 14 ++++++++--- pyanaconda/network.py | 47 ++++++++++++++----------------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/pyanaconda/installclasses/fedora.py b/pyanaconda/installclasses/fedora.py index 5b59c35..00eae33 100644 --- a/pyanaconda/installclasses/fedora.py +++ b/pyanaconda/installclasses/fedora.py @@ -45,8 +45,13 @@ class InstallClass(BaseInstallClass): def setNetworkOnbootDefault(self, ksdata): # if something's already enabled, we can just leave the config alone for devName in nm.nm_devices(): - if not nm.nm_device_type_is_wifi(devName) and \ - network.get_ifcfg_value(devName, "ONBOOT", ROOT_PATH) == "yes": + if nm.nm_device_type_is_wifi(devName): + continue + try: + onboot = nm.nm_device_setting_value(devName, "connection", "autoconnect") + except nm.DeviceSettingsNotFoundError: + continue + if not onboot == False: return # the default otherwise: bring up the first wired netdev with link @@ -59,7 +64,10 @@ class InstallClass(BaseInstallClass): continue if link_up: dev = network.NetworkDevice(ROOT_PATH + network.netscriptsDir, devName) - dev.loadIfcfgFile() + try: + dev.loadIfcfgFile() + except IOError as e: + continue dev.set(('ONBOOT', 'yes')) dev.writeIfcfgFile() for nd in ksdata.network.network: diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 35942ba..f70c0a2 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -307,7 +307,6 @@ class NetworkDevice(IfcfgFile): f.close() return content - def dumpMissingDefaultIfcfgs(): """ Dump missing default ifcfg file for wired devices. @@ -327,9 +326,12 @@ def dumpMissingDefaultIfcfgs(): if not nm.nm_device_type_is_ethernet(devname): continue - # if there is no ifcfg file for the device - device_cfg = NetworkDevice(netscriptsDir, devname) - if os.access(device_cfg.path, os.R_OK): + # check that device has connection without ifcfg file + try: + con_uuid = nm.nm_device_setting_value(devname, "connection", "uuid") + except nm.DeviceSettingsNotFoundError: + continue + if get_ifcfg_name([("UUID", con_uuid)], root_path=""): continue try: @@ -613,26 +615,23 @@ def kickstartNetworkData(ifcfg=None, hostname=None): # pylint: disable-msg=E1101 return handler.NetworkData(**kwargs) -def get_bond_master_ifcfg_name(devname): - """Name of ifcfg file of bond device devname""" - - for filename in _ifcfg_files(netscriptsDir): +def get_ifcfg_name(values, root_path=""): + for filename in _ifcfg_files(os.path.normpath(root_path+netscriptsDir)): ifcfg = NetworkDevice(netscriptsDir, filename[6:]) ifcfg.loadIfcfgFile() - # FIXME: dracut has only BOND_OPTS - if ifcfg.get("BONDING_MASTER") == "yes" or ifcfg.get("TYPE") == "Bond": - if ifcfg.get("DEVICE") == devname: - return filename + for key, value in values: + if ifcfg.get(key) != value: + break + else: + return filename + +def get_bond_master_ifcfg_name(devname): + """Name of ifcfg file of bond device devname""" + return get_ifcfg_name([("TYPE", "Bond"), ("DEVICE", devname)]) def get_vlan_ifcfg_name(devname): """Name of ifcfg file of vlan device devname""" - - for filename in _ifcfg_files(netscriptsDir): - ifcfg = NetworkDevice(netscriptsDir, filename[6:]) - ifcfg.loadIfcfgFile() - if ifcfg.get("VLAN") == "yes" or ifcfg.get("TYPE") == "Vlan": - if ifcfg.get("DEVICE") == devname: - return filename + return get_ifcfg_name([("TYPE", "Vlan"), ("DEVICE", devname)]) def get_bond_slaves_from_ifcfgs(master_specs): """List of slave device names of master specified by master_specs. @@ -751,16 +750,6 @@ def get_ksdevice_name(ksspec=""): return ksdevice -# note that NetworkDevice.get returns "" if key is not found -def get_ifcfg_value(iface, key, root_path=""): - dev = NetworkDevice(os.path.normpath(root_path + netscriptsDir), iface) - try: - dev.loadIfcfgFile() - except IOError as e: - log.debug("get_ifcfg_value %s %s: %s", iface, key, e) - return "" - return dev.get(key) - def set_hostname(hn): if flags.imageInstall: log.info("image install -- not setting hostname") -- 1.7.11.7

2 1

[PATCH] Do not try to set None as hostname (#1002737)
by Vratislav Podzimek 05 Sep '13

05 Sep '13

This might happen in the Initial Setup in some special cases. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/network.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index f7c1275..97c2174 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -1084,6 +1084,8 @@ class NetworkControlBox(object): @hostname.setter def hostname(self, value): + if not value: + return self.entry_hostname.set_text(value) -- 1.7.11.7

2 1

[initial-setup] Apply timezone and NTP configuration
by Vratislav Podzimek 05 Sep '13

05 Sep '13

*** BLURB HERE *** Hans de Goede (1): Apply the timezone and NTP configuration (#985566) initial_setup/__main__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 1.7.11.7

2 3

[master][PATCH] Share code between the Welcome and Langsupport spokes
by Vratislav Podzimek 05 Sep '13

05 Sep '13

These two spokes do the same in a lot of places so they can share the code. It doesn't in a lot of removed lines, but a lot of things will be fixed only at one place instead of two in the future. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/langsupport.py | 105 +------------- .../ui/gui/spokes/lib/lang_locale_handler.py | 161 +++++++++++++++++++++ pyanaconda/ui/gui/spokes/welcome.py | 105 +------------- 3 files changed, 173 insertions(+), 198 deletions(-) create mode 100644 pyanaconda/ui/gui/spokes/lib/lang_locale_handler.py diff --git a/pyanaconda/ui/gui/spokes/langsupport.py b/pyanaconda/ui/gui/spokes/langsupport.py index 7f642d1..125e3b5 100644 --- a/pyanaconda/ui/gui/spokes/langsupport.py +++ b/pyanaconda/ui/gui/spokes/langsupport.py @@ -26,6 +26,7 @@ from pyanaconda.i18n import N_ from pyanaconda.iutil import strip_accents from pyanaconda.ui.gui.spokes import NormalSpoke from pyanaconda.ui.gui.categories.localization import LocalizationCategory +from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler from pyanaconda.ui.gui.utils import set_treeview_selection from pyanaconda import localization @@ -36,7 +37,7 @@ log = logging.getLogger("anaconda") __all__ = ["LangsupportSpoke"] -class LangsupportSpoke(NormalSpoke): +class LangsupportSpoke(LangLocaleHandler, NormalSpoke): builderObjects = ["languageStore", "languageStoreFilter", "localeStore", "langsupportWindow"] mainWidgetName = "langsupportWindow" uiFile = "spokes/langsupport.glade" @@ -61,16 +62,7 @@ class LangsupportSpoke(NormalSpoke): self._localeStore = self.builder.get_object("localeStore") self._localeView = self.builder.get_object("localeView") - # fill the list with available translations - for lang in localization.get_available_translations(): - self._add_language(self._languageStore, - localization.get_native_name(lang), - localization.get_english_name(lang), lang) - - # render a right arrow for the chosen language - self._right_arrow = Gtk.Image.new_from_file("/usr/share/anaconda/pixmaps/right-arrow-icon.png") - self._langSelectedColumn.set_cell_data_func(self._langSelectedRenderer, - self._render_lang_selected) + LangLocaleHandler.initialize(self) # mark selected locales and languages with selected locales bold localeNativeColumn = self.builder.get_object("localeNativeName") @@ -84,9 +76,6 @@ class LangsupportSpoke(NormalSpoke): renderer = self.builder.get_object(rend) column.set_cell_data_func(renderer, self._mark_selected_language_bold) - # make filtering work - self._languageStoreFilter.set_visible_func(self._matches_entry, None) - def apply(self): # store only additional langsupport locales self.data.lang.addsupport = sorted(self._selected_locales - set([self.data.lang.lang])) @@ -123,83 +112,13 @@ class LangsupportSpoke(NormalSpoke): native_span = '%s' % (lang, native) store.append([native_span, english, lang]) - def _addLocale(self, store, native, locale): + def _add_locale(self, store, native, locale): native_span = '%s' % (re.sub(r'\..*', '', locale), native) # native, locale, selected, additional store.append([native_span, locale, locale in self._selected_locales, locale != self.data.lang.lang]) - def _refresh_locale_store(self, lang): - """Refresh the localeStore with locales for the given language.""" - - self._localeStore.clear() - locales = localization.get_language_locales(lang) - for locale in locales: - self._addLocale(self._localeStore, - localization.get_native_name(locale), - locale) - - # select the first locale (with the highest rank) - set_treeview_selection(self._localeView, locales[0], col=1) - - def _select_locale(self, locale): - """ - Try to select the given locale in the language and locale - treeviews. This method tries to find the best match for the given - locale. - - :return: a pair of selected iterators (language and locale) - :rtype: a pair of GtkTreeIter or None objects - - """ - - # get lang and select it - parts = localization.parse_langcode(locale) - if "language" not in parts: - # invalid locale, cannot select - return (None, None) - - lang_itr = set_treeview_selection(self._langView, parts["language"], col=2) - self._refresh_locale_store(parts["language"]) #XXX: needed? - - # find matches and use the one with the highest rank - locales = localization.get_language_locales(locale) - locale_itr = set_treeview_selection(self._localeView, locales[0], col=1) - - return (lang_itr, locale_itr) - - def _matches_entry(self, model, itr, *args): - # Need to strip out the pango markup before attempting to match. - # Otherwise, starting to type "span" for "spanish" will match everything - # due to the enclosing span tag. - # (success, attrs, native, accel) - native = Pango.parse_markup(model[itr][0], -1, "_")[2] - english = model[itr][1] - entry = self._languageEntry.get_text().strip() - - # Nothing in the text entry? Display everything. - if not entry: - return True - - # Otherwise, filter the list showing only what is matched by the - # text entry. Either the English or native names can match. - lowered = entry.lower() - translit = strip_accents(unicode(native, "utf-8")).lower() - if lowered in native.lower() or lowered in english.lower() or lowered in translit: - return True - else: - return False - - def _render_lang_selected(self, column, renderer, model, itr, user_data=None): - (lang_store, sel_itr) = self._langSelection.get_selected() - - lang_locales = set(localization.get_language_locales(model[itr][2])) - if sel_itr and lang_store[sel_itr][2] == model[itr][2]: - renderer.set_property("pixbuf", self._right_arrow.get_pixbuf()) - else: - renderer.set_property("pixbuf", None) - def _mark_selected_locale_bold(self, column, renderer, model, itr, user_data=None): if model[itr][2]: renderer.set_property("weight", Pango.Weight.BOLD.real) @@ -214,15 +133,6 @@ class LangsupportSpoke(NormalSpoke): renderer.set_property("weight", Pango.Weight.NORMAL.real) # Signal handlers. - def on_lang_selection_changed(self, selection): - (store, selected) = selection.get_selected_rows() - - if selected: - lang = store[selected[0]][2] - self._refresh_locale_store(lang) - else: - self._localeStore.clear() - def on_locale_toggled(self, renderer, path): itr = self._localeStore.get_iter(path) row = self._localeStore[itr] @@ -233,10 +143,3 @@ class LangsupportSpoke(NormalSpoke): self._selected_locales.add(row[1]) else: self._selected_locales.remove(row[1]) - - def on_clear_icon_clicked(self, entry, icon_pos, event): - if icon_pos == Gtk.EntryIconPosition.SECONDARY: - entry.set_text("") - - def on_entry_changed(self, *args): - self._languageStoreFilter.refilter() diff --git a/pyanaconda/ui/gui/spokes/lib/lang_locale_handler.py b/pyanaconda/ui/gui/spokes/lib/lang_locale_handler.py new file mode 100644 index 0000000..dea6bef --- /dev/null +++ b/pyanaconda/ui/gui/spokes/lib/lang_locale_handler.py @@ -0,0 +1,161 @@ +# +# Copyright (C) 2011-2012 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions of +# the GNU General Public License v.2, or (at your option) any later version. +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY expressed or implied, including the implied warranties of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. You should have received a copy of the +# GNU General Public License along with this program; if not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the +# source code or documentation are not subject to the GNU General Public +# License and may only be used or replicated with the express permission of +# Red Hat, Inc. +# +# Red Hat Author(s): Vratislav Podzimek <vpodzime(a)redhat.com> +# + +""" +Module providing the LangLocaleHandler class that could be used as a mixin for +screens handling languages or locales configuration. + +""" + +from gi.repository import Gtk, Pango +from pyanaconda import localization +from pyanaconda.iutil import strip_accents +from pyanaconda.ui.gui.utils import set_treeview_selection + +class LangLocaleHandler(object): + """ + Class that could be used as a mixin for screens handling languages or + locales configuration. + + """ + + def __init__(self): + # the class inheriting from this class is responsible for populating + # these items with actual objects + self._languageStore = None + self._languageStoreFilter = None + self._languageEntry = None + self._langSelection = None + self._langSelectedRenderer = None + self._langSelectedColumn = None + self._langView = None + self._localeView = None + self._localeStore = None + self._localeSelection = None + + def initialize(self): + # Render a right arrow for the chosen language + self._right_arrow = Gtk.Image.new_from_file("/usr/share/anaconda/pixmaps/right-arrow-icon.png") + self._langSelectedColumn.set_cell_data_func(self._langSelectedRenderer, + self._render_lang_selected) + + # fill the list with available translations + for lang in localization.get_available_translations(): + self._add_language(self._languageStore, + localization.get_native_name(lang), + localization.get_english_name(lang), lang) + + # make filtering work + self._languageStoreFilter.set_visible_func(self._matches_entry, None) + + def _matches_entry(self, model, itr, *args): + # Nothing in the text entry? Display everything. + entry = self._languageEntry.get_text().strip() + if not entry: + return True + + # Need to strip out the pango markup before attempting to match. + # Otherwise, starting to type "span" for "spanish" will match everything + # due to the enclosing span tag. + # (success, attrs, native, accel) + native = Pango.parse_markup(model[itr][0], -1, "_")[2] + english = model[itr][1] + + # Otherwise, filter the list showing only what is matched by the + # text entry. Either the English or native names can match. + lowered = entry.lower() + translit = strip_accents(unicode(native, "utf-8")).lower() + if lowered in native.lower() or lowered in english.lower() or lowered in translit: + return True + else: + return False + + def _render_lang_selected(self, column, renderer, model, itr, user_data=None): + (lang_store, sel_itr) = self._langSelection.get_selected() + + if sel_itr and lang_store[sel_itr][2] == model[itr][2]: + renderer.set_property("pixbuf", self._right_arrow.get_pixbuf()) + else: + renderer.set_property("pixbuf", None) + + def _add_language(self, store, native, english, lang): + """Override this method with a valid implementation""" + + raise NotImplementedError() + + def _add_locale(self, store, native, locale): + """Override this method with a valid implementation""" + + raise NotImplementedError() + + def _select_locale(self, locale): + """ + Try to select the given locale in the language and locale + treeviews. This method tries to find the best match for the given + locale. + + :return: a pair of selected iterators (language and locale) + :rtype: a pair of GtkTreeIter or None objects + + """ + + # get lang and select it + parts = localization.parse_langcode(locale) + if "language" not in parts: + # invalid locale, cannot select + return (None, None) + + lang_itr = set_treeview_selection(self._langView, parts["language"], col=2) + + # find matches and use the one with the highest rank + locales = localization.get_language_locales(locale) + locale_itr = set_treeview_selection(self._localeView, locales[0], col=1) + + return (lang_itr, locale_itr) + + def _refresh_locale_store(self, lang): + """Refresh the localeStore with locales for the given language.""" + + self._localeStore.clear() + locales = localization.get_language_locales(lang) + for locale in locales: + self._add_locale(self._localeStore, + localization.get_native_name(locale), + locale) + + # select the first locale (with the highest rank) + set_treeview_selection(self._localeView, locales[0], col=1) + + def on_lang_selection_changed(self, selection): + (store, selected) = selection.get_selected_rows() + + if selected: + lang = store[selected[0]][2] + self._refresh_locale_store(lang) + else: + self._localeStore.clear() + + def on_clear_icon_clicked(self, entry, icon_pos, event): + if icon_pos == Gtk.EntryIconPosition.SECONDARY: + entry.set_text("") + + def on_entry_changed(self, *args): + self._languageStoreFilter.refilter() + diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py index 5bd8c8a..80af8d8 100644 --- a/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py @@ -28,6 +28,7 @@ from gi.repository import Gtk, Pango from pyanaconda.ui.gui.hubs.summary import SummaryHub from pyanaconda.ui.gui.spokes import StandaloneSpoke from pyanaconda.ui.gui.utils import enlightbox, set_treeview_selection +from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler from pyanaconda import localization from pyanaconda.product import distributionText, isFinal, productName, productVersion @@ -43,7 +44,7 @@ log = logging.getLogger("anaconda") __all__ = ["WelcomeLanguageSpoke"] -class WelcomeLanguageSpoke(StandaloneSpoke): +class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke): mainWidgetName = "welcomeWindow" uiFile = "spokes/welcome.glade" builderObjects = ["languageStore", "languageStoreFilter", "localeStore", @@ -143,14 +144,6 @@ class WelcomeLanguageSpoke(StandaloneSpoke): def _row_is_separator(self, model, itr, *args): return model[itr][3] - def _render_lang_selected(self, column, renderer, model, itr, user_data=None): - (lang_store, sel_itr) = self._langSelection.get_selected() - - if sel_itr and lang_store[sel_itr][2] == model[itr][2]: - renderer.set_property("pixbuf", self._right_arrow.get_pixbuf()) - else: - renderer.set_property("pixbuf", None) - def initialize(self): self._languageStore = self.builder.get_object("languageStore") self._languageStoreFilter = self.builder.get_object("languageStoreFilter") @@ -163,14 +156,11 @@ class WelcomeLanguageSpoke(StandaloneSpoke): self._localeStore = self.builder.get_object("localeStore") self._localeSelection = self.builder.get_object("localeViewSelection") + LangLocaleHandler.initialize(self) + # We need to tell the view whether something is a separator or not. self._langView.set_row_separator_func(self._row_is_separator, None) - # Render a right arrow for the chosen language - self._right_arrow = Gtk.Image.new_from_file("/usr/share/anaconda/pixmaps/right-arrow-icon.png") - self._langSelectedColumn.set_cell_data_func(self._langSelectedRenderer, - self._render_lang_selected) - # We can use the territory from geolocation here # to preselect the translation, when it's available. territory = geoloc.get_territory_code(wait=True) @@ -181,12 +171,6 @@ class WelcomeLanguageSpoke(StandaloneSpoke): # kickstart/command line localization.setup_locale(locales[0], self.data.lang) - # fill the list with available translations - for lang in localization.get_available_translations(): - self._addLanguage(self._languageStore, - localization.get_native_name(lang), - localization.get_english_name(lang), lang) - # Move the default language (whatever was provided on the command line, # or by kickstart, or by geoip, or English if nothing else) to the top # of the list and select it by default. People find it confusing to be @@ -210,8 +194,6 @@ class WelcomeLanguageSpoke(StandaloneSpoke): newItr = store.insert(1) store.set(newItr, 0, "", 1, "", 2, "", 3, True) - self._languageStoreFilter.set_visible_func(self._matchesEntry, None) - def _retranslate_one(self, widgetName): widget = self.builder.get_object(widgetName) if not widget: @@ -251,85 +233,21 @@ class WelcomeLanguageSpoke(StandaloneSpoke): self._languageEntry.set_text("") self._languageStoreFilter.refilter() - def _addLanguage(self, store, native, english, lang): + def _add_language(self, store, native, english, lang): native_span = '%s' % (lang, native) store.append([native_span, english, lang, False]) - def _addLocale(self, store, native, locale): + def _add_locale(self, store, native, locale): native_span = '%s' % (re.sub(r'\..*', '', locale), native) store.append([native_span, locale]) - def _matchesEntry(self, model, itr, *args): - # Need to strip out the pango markup before attempting to match. - # Otherwise, starting to type "span" for "spanish" will match everything - # due to the enclosing span tag. - # (success, attrs, native, accel) - native = Pango.parse_markup(model[itr][0], -1, "_")[2] - english = model[itr][1] - entry = self._languageEntry.get_text().strip() - - # Nothing in the text entry? Display everything. - if not entry: - return True - - # Otherwise, filter the list showing only what is matched by the - # text entry. Either the English or native names can match. - lowered = entry.lower() - translit = strip_accents(unicode(native, "utf-8")).lower() - if lowered in native.lower() or lowered in english.lower() or lowered in translit: - return True - else: - return False - - def _select_locale(self, locale): - """ - Try to select the given locale in the language and locale - treeviews. This method tries to find the best match for the given - locale. - - :return: a pair of selected iterators (language and locale) - :rtype: a pair of GtkTreeIter or None objects - - """ - - # get lang and select it - parts = localization.parse_langcode(locale) - if "language" not in parts: - # invalid locale, cannot select - return (None, None) - - lang_itr = set_treeview_selection(self._langView, parts["language"], col=2) - - # find matches and use the one with the highest rank - locales = localization.get_language_locales(locale) - locale_itr = set_treeview_selection(self._localeView, locales[0], col=1) - - return (lang_itr, locale_itr) - - def _refresh_locale_store(self, lang): - """Refresh the localeStore with locales for the given language.""" - - self._localeStore.clear() - locales = localization.get_language_locales(lang) - for locale in locales: - self._addLocale(self._localeStore, - localization.get_native_name(locale), - locale) - - # select the first locale (with the highest rank) - set_treeview_selection(self._localeView, locales[0], col=1) - # Signal handlers. def on_lang_selection_changed(self, selection): (store, selected) = selection.get_selected_rows() + LangLocaleHandler.on_lang_selection_changed(self, selection) - if selected: - lang = store[selected[0]][2] - self._refresh_locale_store(lang) - else: - if hasattr(self.window, "set_may_continue"): + if not selected and hasattr(self.window, "set_may_continue"): self.window.set_may_continue(False) - self._localeStore.clear() def on_locale_selection_changed(self, selection): (store, selected) = selection.get_selected_rows() @@ -341,13 +259,6 @@ class WelcomeLanguageSpoke(StandaloneSpoke): localization.setup_locale(lang) self.retranslate(lang) - def on_clear_icon_clicked(self, entry, icon_pos, event): - if icon_pos == Gtk.EntryIconPosition.SECONDARY: - entry.set_text("") - - def on_entry_changed(self, *args): - self._languageStoreFilter.refilter() - # Override the default in StandaloneSpoke so we can display the beta # warning dialog first. def _on_continue_clicked(self, cb): -- 1.7.11.7

2 1

[rhel7-branch][master][PATCH] Handle kickstarts that don't specify timezone (#1001598)
by Martin Kolman 05 Sep '13

05 Sep '13

During kickstarted installation, no default timezone is set and if the kickstart does not specify a timezone, the date time spoke needs to work correctly without an initial timezone value. Signed-off-by: Martin Kolman <mkolman(a)redhat.com> --- pyanaconda/ui/gui/spokes/datetime_spoke.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py index 5e0c9ce..cfd4887 100644 --- a/pyanaconda/ui/gui/spokes/datetime_spoke.py +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py @@ -405,12 +405,16 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke): return _("Nothing selected") def apply(self): - old_tz = self.data.timezone.timezone - # we could use self._tzmap.get_timezone() here, but it returns "" if # Etc/XXXXXX timezone is selected region = self._get_active_region() city = self._get_active_city() + # nothing selected, just leave the spoke and + # return to hub without changing anything + if not region or not city: + return + + old_tz = self.data.timezone.timezone new_tz = region + "/" + city self.data.timezone.timezone = new_tz @@ -702,8 +706,9 @@ class DatetimeSpoke(FirstbootSpokeMixIn, NormalSpoke): def _restore_old_city_region(self): """Restore stored "old" (or last valid) values.""" - - self._set_timezone(self._old_region + "/" + self._old_city) + # check if there are old value to go back to + if self._old_region and self._old_city: + self._set_timezone(self._old_region + "/" + self._old_city) def on_up_hours_clicked(self, *args): self._stop_and_maybe_start_time_updating() -- 1.8.3.1

2 1

[master] Another solution for a bug fixed in a different way
by Vratislav Podzimek 04 Sep '13

04 Sep '13

I think this should go to rhel7-branch as well. Vratislav Podzimek (1): Setup language early to a value we can figure out anaconda | 9 ++++++--- pyanaconda/ui/gui/hubs/progress.py | 10 ++-------- 2 files changed, 8 insertions(+), 11 deletions(-) -- 1.7.11.7

2 4

[lorax][PATCH] Firstboot is not an anaconda dependency
by Vratislav Podzimek 04 Sep '13

04 Sep '13

Moreover, it doesn't even exist in the F20 tree. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- share/runtime-install.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index 04afb8d..9406ecb 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -5,7 +5,6 @@ installpkg anaconda anaconda-widgets ## anaconda deps that aren't in the RPM installpkg tmux -installpkg firstboot installpkg iscsi-initiator-utils ## speed up compression on multicore systems installpkg pigz -- 1.7.11.7

2 2

[blivet][rhel7-branch]
by David Lehman 04 Sep '13

04 Sep '13

blivet/devices.py | 14 ++++++++++++++ blivet/formats/luks.py | 5 ++++- blivet/partitioning.py | 3 --- 3 files changed, 18 insertions(+), 4 deletions(-)

3 6

[rhel7-branch][PATCH] Don't enable chronyd if disabled in kickstart (#1002583)
by Martin Kolman 04 Sep '13

04 Sep '13

If the chronyd service is disabled in kickstart, it should not be automatically enabled. Signed-off-by: Martin Kolman <mkolman(a)redhat.com> --- pyanaconda/kickstart.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 031a6f1..3993fd3 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -1301,7 +1301,8 @@ class Timezone(commands.timezone.F18_Timezone): ksdata.packages.packageList.append(NTP_PACKAGE) self._added_chrony = True - if not NTP_SERVICE in ksdata.services.enabled: + if not NTP_SERVICE in ksdata.services.enabled and \ + not NTP_SERVICE in ksdata.services.disabled: ksdata.services.enabled.append(NTP_SERVICE) self._enabled_chrony = True -- 1.8.3.1

2 1

[master][PATCH] Don't try to parse langcode if none given
by Vratislav Podzimek 04 Sep '13

04 Sep '13

Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/localization.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyanaconda/localization.py b/pyanaconda/localization.py index cf47a43..f9469d8 100644 --- a/pyanaconda/localization.py +++ b/pyanaconda/localization.py @@ -82,6 +82,9 @@ def parse_langcode(langcode): """ + if not langcode: + return None + match = LANGCODE_RE.match(langcode) if match: return match.groupdict() -- 1.7.11.7

2 1

[initial-setup] EULA agreement spoke for the I-S
by Vratislav Podzimek 04 Sep '13

04 Sep '13

Patches 1/3 and 2/3 fix things that are needed for the EULA spoke to be collected and shown by the hub. PATCH 2/3 requires the changes made in the related anaconda patches. PATCH 3/3 adds the EULA spoke. The screenshots of the spoke can be found at: http://vpodzime.fedorapeople.org/eula_i-s/ I don't know into which category the spoke should be put, but I don't want to add another category just for this one. Any suggestions? Shall we merge it into one of the existing categories and rename it? Or can EULA agreement be considered part of User Settings? Vratislav Podzimek (3): Fix the base mask of initial_setup gui submodules Specify and use environment of the main hub EULA agreement spoke (#1000409) initial_setup/gui/gui.py | 2 +- initial_setup/gui/hubs/initial_setup_hub.py | 7 +- initial_setup/gui/spokes/eula.glade | 113 ++++++++++++++++++++++++++++ initial_setup/gui/spokes/eula.py | 74 ++++++++++++++++++ initial_setup/product.py | 56 ++++++++++++++ 5 files changed, 250 insertions(+), 2 deletions(-) create mode 100644 initial_setup/gui/spokes/eula.glade create mode 100644 initial_setup/gui/spokes/eula.py -- 1.7.11.7

2 8

[master/rhel7 1/2] Fix fastestmirror plugin check (#876135)
by Brian C. Lane 04 Sep '13

04 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> It ends up enabledPlugins is just the list we gave yum to load, it doesn't reflect success or failure. If a plugin is actually loaded it is added to the internal dict plugins._plugins Related: rhbz#876135 --- pyanaconda/packaging/yumpayload.py | 2 +- pyanaconda/ui/gui/spokes/source.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 3ce95d1..4926e96 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -420,7 +420,7 @@ reposdir=%s @property def mirrorEnabled(self): with _yum_lock: - return "fastestmirror" in self._yum.plugins.enabledPlugins + return "fastestmirror" in self._yum.plugins._plugins def getRepo(self, repo_id): """ Return the yum repo object. """ diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index e49f163..8dd8ba2 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -641,10 +641,13 @@ class SourceSpoke(NormalSpoke): combo = self.builder.get_object("isoPartitionCombo") combo.set_active(active) - # We default to the mirror list, and then if the method tells us - # something different later, we can change it. - self._protocolComboBox.set_active(PROTOCOL_MIRROR) - self._urlEntry.set_sensitive(False) + # We default to the mirror list if available. http otherwise + if self.payload.mirrorEnabled: + self._protocolComboBox.set_active(PROTOCOL_MIRROR) + self._urlEntry.set_sensitive(False) + else: + self._protocolComboBox.set_active(PROTOCOL_HTTP) + self._urlEntry.set_sensitive(True) # Set up the default state of UI elements. if self.data.method.method == "url": -- 1.8.3.1

2 2

[master/rhel7-branch] Don't mark spoke as completed if no repo is set. (#1001538)
by Samantha N. Bueno 03 Sep '13

03 Sep '13

Even though the status text notifies users there is a problem setting up the install repo, the spoke should not be getting detected as 'complete'. In the GUI, this now marks the spoke with the error icon so it's more visibly obvious to users the spoke needs attention. In the TUI, the '!' (for 'not complete') is shown next to the spoke instead of 'x' ('complete'). Resolves: rhbz#1001538 --- pyanaconda/ui/gui/spokes/source.py | 2 +- pyanaconda/ui/tui/spokes/source.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index e49f163..e6489ef 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -463,7 +463,7 @@ class SourceSpoke(NormalSpoke): if flags.automatedInstall and (not self.data.method.method or not self.payload.baseRepo): return False else: - return not self._error and self.status and self.status != _("Nothing selected") + return not self._error and self.status and (self.data.method.method or self.payload.baseRepo) @property def mandatory(self): diff --git a/pyanaconda/ui/tui/spokes/source.py b/pyanaconda/ui/tui/spokes/source.py index 020e392..566edf0 100644 --- a/pyanaconda/ui/tui/spokes/source.py +++ b/pyanaconda/ui/tui/spokes/source.py @@ -112,7 +112,7 @@ class SourceSpoke(EditTUISpoke): if flags.automatedInstall and (not self.data.method.method or not self.payload.baseRepo): return False else: - return not self.errors and self.ready + return not self.errors and self.ready and (self.data.method.method or self.payload.baseRepo) def refresh(self, args=None): EditTUISpoke.refresh(self, args) -- 1.7.11.7

2 1

[PATCH] Don't mount cdroms that contain no mountable media. (#1000889)
by David Lehman 03 Sep '13

03 Sep '13

--- pyanaconda/image.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyanaconda/image.py b/pyanaconda/image.py index adc0660..86e7937 100644 --- a/pyanaconda/image.py +++ b/pyanaconda/image.py @@ -190,6 +190,10 @@ def opticalInstallMedia(devicetree, mountpoint=INSTALL_TREE): for dev in devicetree.getDevicesByType("cdrom"): devicetree.updateDeviceFormat(dev) + if not hasattr(dev.format, "mount"): + # no mountable media + continue + try: dev.format.mount(mountpoint=mountpoint) except FSError: -- 1.8.1.4

2 1

[master/rhel7-branch] Warn user if they enter a weak password in TUI. (#1001039)
by Samantha N. Bueno 03 Sep '13

03 Sep '13

This is in keeping some consistency with GUI behavior, check a user's pw quality score and warn/prompt them to confirm whether they are ok with using a weak pw. Resolves: rhbz#1001039 --- pyanaconda/ui/tui/spokes/__init__.py | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pyanaconda/ui/tui/spokes/__init__.py b/pyanaconda/ui/tui/spokes/__init__.py index 2f92126..fc904b3 100644 --- a/pyanaconda/ui/tui/spokes/__init__.py +++ b/pyanaconda/ui/tui/spokes/__init__.py @@ -22,7 +22,7 @@ from pyanaconda.ui.tui import simpleline as tui from pyanaconda.ui.tui.tuiobject import TUIObject, YesNoDialog from pyanaconda.ui.common import Spoke, StandaloneSpoke, NormalSpoke, PersonalizationSpoke, collect from pyanaconda.users import validatePassword -from pwquality import PWQError +import pwquality import re from collections import namedtuple from pyanaconda.iutil import setdeepattr, getdeepattr @@ -104,6 +104,25 @@ class EditTUIDialog(NormalTUISpoke): return True def prompt(self, entry = None): + def _validatePassword(pw, confirm): + """ Better password checking. This sets up a quality checker + to score password attempts. This is similar to the pw quality + check done in the GUI, except this only raises an error if a + password is weak. + """ + # set up quality checker + _pwq = pwquality.PWQSettings() + _pwq.read_config() + + error = validatePassword(pw, confirm) + if error: + return error + strength = _pwq.check(pw, None, None) + if strength < 50: + raise pwquality.PWQError + else: + return None + if not entry: return None @@ -114,11 +133,11 @@ class EditTUIDialog(NormalTUISpoke): # just returning an error is either blank or mismatched # passwords. Raising is because of poor quality. try: - error = validatePassword(pw, confirm) + error = _validatePassword(pw, confirm) if error: print(error) return None - except PWQError as e: + except pwquality.PWQError as e: error = _("You have provided a weak password: %s. " % e.message) error += _("\nWould you like to use it anyway?") question_window = YesNoDialog(self._app, error) -- 1.7.11.7

2 3

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches September 2013