September 2013 - anaconda-patches - Fedora mailing-lists

[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 12 Sep '13

12 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 11 Sep '13

11 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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches September 2013