anaconda-patches September 2012

anaconda-patches@lists.fedorahosted.org

15 participants
105 discussions

Take 2 at text kickstarts
by Jesse Keating 25 Sep '12

25 Sep '12

Also make use of the all() method to clean up some code, and fix storage spoke some more. Tested on branched with a local compose and updates.img. -jlk

3 12

[master/rhel6] Add debug option to bumpver
by Brian C. Lane 25 Sep '12

25 Sep '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- Makefile.am | 3 +++ scripts/makebumpver | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 733a575..4f76895 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,6 +76,9 @@ bumpver: po-pull if [ ! -z "$(MAP)" ]; then \ opts="$${opts} -m $(MAP)" ; \ fi ; \ + if [ ! -z "$(BZDEBUG)" ]; then \ + opts="$${opts} -d" ; \ + fi ; \ scripts/makebumpver $${opts} || exit 1 ; \ $(MAKE) -C po $(PACKAGE_NAME).pot-update ; \ tx push $(TX_PUSH_ARGS) diff --git a/scripts/makebumpver b/scripts/makebumpver index e497fea..9fe577c 100755 --- a/scripts/makebumpver +++ b/scripts/makebumpver @@ -20,6 +20,11 @@ # # Author: David Cantrell <dcantrell(a)redhat.com> +import logging +logging.basicConfig(level=logging.DEBUG) +log = logging.getLogger("bugzilla") +log.setLevel(logging.INFO) + import bugzilla import datetime import getopt @@ -32,6 +37,7 @@ import textwrap class MakeBumpVer: def __init__(self, *args, **kwargs): + log.debug("%s" % (kwargs,)) self.bzserver = 'bugzilla.redhat.com' self.bzurl = "https://%s/xmlrpc.cgi" % self.bzserver self.username = None @@ -134,9 +140,11 @@ class MakeBumpVer: print if not self.bz.logged_in: - self.bz.login(self.username, self.password) + rc = self.bz.login(self.username, self.password) + log.debug("login rc = %s" % (rc,)) bugs = self.bz.query({'bug_id': bug}) + log.debug("bugs = %s" % (bugs)) if len(bugs) != 1: return None @@ -372,6 +380,7 @@ def usage(cmd): sys.stdout.write(" -b, --bugreport Bug reporting email address.\n") sys.stdout.write(" -i, --ignore Comma separated list of git commits to ignore.\n") sys.stdout.write(" -m, --map Comma separated list of FEDORA_BZ=RHEL_BZ mappings.\n") + sys.stdout.write(" -d, --debug Turn on debug logging to stdout\n") sys.stdout.write("\nThe -i switch is intended for use with utility commits that we do not need to\n") sys.stdout.write("reference in the spec file changelog. The -m switch is used to map a Fedora\n") sys.stdout.write("BZ number to a RHEL BZ number for the spec file changelog. Use -m if you have\n") @@ -389,10 +398,10 @@ def main(argv): opts, args = [], [] try: - opts, args = getopt.getopt(sys.argv[1:], 'n:v:r:b:i:m:?', + opts, args = getopt.getopt(sys.argv[1:], 'n:v:r:b:i:m:d?', ['name=', 'version=', 'release=', 'bugreport=', 'ignore=', 'map=', - 'help']) + 'debug', 'help']) except getopt.GetoptError: help = True @@ -409,6 +418,8 @@ def main(argv): ignore = a elif o in ('-m', '--map'): bugmap = a + elif o in ('-d', '--debug'): + log.setLevel(logging.DEBUG) elif o in ('-?', '--help'): help = True else: -- 1.7.11.4

2 1

[master] Two little tweaks for the AddLayout dialog
by Vratislav Podzimek 25 Sep '12

25 Sep '12

PATCH 1/2 removes useless piece of code. PATCH 2/2 adds a double-click functionality to the AddLayout dialog. Vratislav Podzimek (2): Remove useless handler of Cancel button (AddLayout dialog) Close AddLayout dialog on double-click pyanaconda/ui/gui/spokes/keyboard.glade | 3 ++- pyanaconda/ui/gui/spokes/keyboard.py | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) -- 1.7.11.4

2 3

Take 3 on textmode kickstart
by Jesse Keating 25 Sep '12

25 Sep '12

Less thread work than take 2, better completed/ready handling. Also handle invalid bootDrive (a test case I used when seeing how we handle kickstart errors). --jlk

2 6

[PATCH] remove rv from unmount error log
by Brian C. Lane 21 Sep '12

21 Sep '12

From: "Brian C. Lane" <bcl(a)redhat.com> You obviously cannot reference it when it hasn't been set. --- src/pylorax/imgutils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pylorax/imgutils.py b/src/pylorax/imgutils.py index baac2b9..0ebb3d2 100644 --- a/src/pylorax/imgutils.py +++ b/src/pylorax/imgutils.py @@ -133,8 +133,8 @@ def umount(mnt, lazy=False, maxretry=3, retrysleep=1.0): count += 1 if count == maxretry: raise - logger.warn("failed to unmount %s (%d). retrying (%d/%d)...", - mnt, rv, count, maxretry) + logger.warn("failed to unmount %s. retrying (%d/%d)...", + mnt, count, maxretry) if logger.getEffectiveLevel() <= logging.DEBUG: fuser = execWithCapture("fuser", ["-vm", mnt]) logger.debug("fuser -vm:\n%s\n", fuser) -- 1.7.11.4

2 1

[PATCH 1/4] Don't write HOSTNAME=HOSTNAME=myhostnamehere (#859141).
by Chris Lumens 21 Sep '12

21 Sep '12

--- pyanaconda/network.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 6a92d24..6318607 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -775,8 +775,6 @@ def write_sysconfig_network(rootpath, ksdata, overwrite=False): f = open(cfgfile, "w") f.write("# Generated by anaconda\n") f.write("NETWORKING=yes\n") - f.write("HOSTNAME=") - f.write("HOSTNAME=%s\n" % ksdata.network.hostname) gateway = ipv6_defaultgw = None -- 1.7.11.2

2 4

[PATCH] Don't use grey for the status text of a SpokeSelector (#855638).
by Chris Lumens 20 Sep '12

20 Sep '12

By hardcoding a color, it makes the status text almost invisible on the KDE live disc where the theme is darker to begin with. Instead, use the theme colors for everything. This isn't a perfect fix: If you focus a SpokeSelector, the text will still be black instead of white like everything else. However, I've been unable to make that work. --- widgets/src/SpokeSelector.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/widgets/src/SpokeSelector.c b/widgets/src/SpokeSelector.c index 2a7bd8c..b25fa11 100644 --- a/widgets/src/SpokeSelector.c +++ b/widgets/src/SpokeSelector.c @@ -59,6 +59,8 @@ struct _AnacondaSpokeSelectorPrivate { GtkWidget *title_label; GtkWidget *status_label; GdkCursor *cursor; + + GtkCssProvider *status_provider; }; G_DEFINE_TYPE(AnacondaSpokeSelector, anaconda_spoke_selector, GTK_TYPE_EVENT_BOX) @@ -190,13 +192,16 @@ static void anaconda_spoke_selector_init(AnacondaSpokeSelector *spoke) { /* Create the status label. */ spoke->priv->status_label = gtk_label_new(NULL); - markup = g_markup_printf_escaped("%s", _(DEFAULT_STATUS)); + markup = g_markup_printf_escaped("%s", _(DEFAULT_STATUS)); gtk_label_set_markup(GTK_LABEL(spoke->priv->status_label), markup); gtk_misc_set_alignment(GTK_MISC(spoke->priv->status_label), 0, 0); gtk_label_set_ellipsize(GTK_LABEL(spoke->priv->status_label), PANGO_ELLIPSIZE_MIDDLE); gtk_label_set_max_width_chars(GTK_LABEL(spoke->priv->status_label), 45); g_free(markup); + spoke->priv->status_provider = gtk_css_provider_new(); + gtk_css_provider_load_from_data(spoke->priv->status_provider, "GtkLabel { color: @text_color }", -1, NULL); + /* Add everything to the grid, add the grid to the widget. */ gtk_grid_attach(GTK_GRID(spoke->priv->grid), spoke->priv->icon, 0, 0, 1, 2); gtk_grid_attach(GTK_GRID(spoke->priv->grid), spoke->priv->title_label, 1, 0, 1, 1); @@ -241,9 +246,17 @@ static void anaconda_spoke_selector_set_property(GObject *object, guint prop_id, break; case PROP_STATUS: { - char *markup = g_markup_printf_escaped("%s", g_value_get_string(value)); + char *markup = g_markup_printf_escaped("%s", g_value_get_string(value)); + GtkStyleContext *context = gtk_widget_get_style_context(GTK_WIDGET(priv->status_label)); + gtk_label_set_markup(GTK_LABEL(priv->status_label), markup); g_free(markup); + + if (gtk_widget_get_sensitive(GTK_WIDGET(widget))) + gtk_style_context_add_provider(context, GTK_STYLE_PROVIDER(priv->status_provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + else + gtk_style_context_remove_provider(context, GTK_STYLE_PROVIDER(priv->status_provider)); + break; } -- 1.7.11.2

2 2

[master] [PATCH] Close temp file before moving it (#858681)
by Vratislav Podzimek 20 Sep '12

20 Sep '12

When writing new NTP servers configuration the temporary file has to be closed before moving it to the right place. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ntp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyanaconda/ntp.py b/pyanaconda/ntp.py index 0fed009..006bef7 100644 --- a/pyanaconda/ntp.py +++ b/pyanaconda/ntp.py @@ -135,6 +135,9 @@ def save_servers_to_config(servers, conf_file_path=NTP_CONFIG_FILE, if not srv_regexp.match(line) and line != heading: new_conf_file.write(line) + old_conf_file.close() + new_conf_file.close() + if not out_file_path: try: stat = os.stat(conf_file_path) @@ -147,9 +150,6 @@ def save_servers_to_config(servers, conf_file_path=NTP_CONFIG_FILE, raise NTPconfigError(msg) - old_conf_file.close() - new_conf_file.close() - def one_time_sync(server, callback=None): """ Synchronize the system time with a given NTP server. Note that this -- 1.7.11.4

2 1

[PATCH rhel6-branch] Take into account all configured ifaces when setting GATEWAY (#846393)
by Radek Vykydal 20 Sep '12

20 Sep '12

Not just the last one in a list. Resolves: rhbz#846393 Ported from master commit 5161a324ad2cf2be636a6cd330390e7f05971c46 --- network.py | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/network.py b/network.py index 1509def..fd9f454 100644 --- a/network.py +++ b/network.py @@ -406,6 +406,22 @@ class Network: self.netdevices[device].set((dnslabel, addr)) i += 1 + @property + def gateway(self): + """GATEWAY - last device in list wins""" + for dev in reversed(self.netdevices.values()): + if dev.get('GATEWAY'): + return dev.get('GATEWAY') + return "" + + @property + def ipv6_defaultgw(self): + """IPV6_DEFAULTGW - last device in list wins""" + for dev in reversed(self.netdevices.values()): + if dev.get('IPV6_DEFAULTGW'): + return dev.get('IPV6_DEFAULTGW') + return "" + def setGateway(self, gw, device): if ':' in gw: self.netdevices[device].set(('IPV6_DEFAULTGW', gw)) @@ -681,11 +697,11 @@ class Network: else: f.write("localhost.localdomain\n") - if dev.get('GATEWAY'): - f.write("GATEWAY=%s\n" % (dev.get('GATEWAY'),)) + if self.gateway: + f.write("GATEWAY=%s\n" % self.gateway) - if dev.get('IPV6_DEFAULTGW'): - f.write("IPV6_DEFAULTGW=%s\n" % (dev.get('IPV6_DEFAULTGW'),)) + if self.ipv6_defaultgw: + f.write("IPV6_DEFAULTGW=%s\n" % self.ipv6_defaultgw) if self.hasBondDevice() or self.hasVlanDevice(): f.write("NM_BOND_VLAN_ENABLED=yes\n") -- 1.7.4

2 1

[PATCH] UEFI paths must include a leading backslash on some machines. (#856938)
by Peter Jones 19 Sep '12

19 Sep '12

Some machines require a leading backslash, some don't require it. None seem to break with it there. --- pyanaconda/bootloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index b0aff48..16f9848 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1594,7 +1594,7 @@ class EFIGRUB(GRUB2): @property def efi_dir_as_efifs_dir(self): ret = self._config_dir.replace('efi/', '') - return ret.replace('/', '\\') + return "\\" + ret.replace('/', '\\') def add_efi_boot_target(self): if self.stage1_device.type == "partition": -- 1.7.11.4

2 1

← Newer
1
2
3
4
5
6
7
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches September 2012