anaconda-patches September 2013

anaconda-patches@lists.fedorahosted.org

17 participants
168 discussions

[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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches September 2013