Anaconda-devel January 2012

anaconda-devel@lists.fedoraproject.org

22 participants
63 discussions

Do not support multiple picture switch on install step any more?
by Wenqi Ma 11 Jan '12

11 Jan '12

Hi, All We use a very old version: 11.1.2.36, now we want to upgrade to 13.21.82 that RHEL6 used. However, I found that the switch code was removed from iw/progress_gui.py. Now, it still read all pictures: def getScreen (self, anaconda): ... self.pixmaps = self._getRnotes() ... But it is never used. So does any one can help me confirm it? thanks a lot! BRs, Wenqi

1 0

grubby patches for autotest boottool
by Cleber Rosa 09 Jan '12

09 Jan '12

This patch series add features that we found to be necessary in our[1] rewrite of boottool that uses grubby underneath. [1] - http://autotest.github.com

2 6

[PATCH 1/3] Make the DiskOverview icon quite a bit smaller.
by Chris Lumens 09 Jan '12

09 Jan '12

200px makes it take up entirely too much of the screen. 125px is a better compromise between the look we're going for and screen space usage. --- widgets/src/DiskOverview.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/widgets/src/DiskOverview.c b/widgets/src/DiskOverview.c index 6ebdb9f..73a423a 100644 --- a/widgets/src/DiskOverview.c +++ b/widgets/src/DiskOverview.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Red Hat, Inc. + * Copyright (C) 2011-2012 Red Hat, Inc. * * 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 @@ -52,6 +52,8 @@ enum { #define DEFAULT_OS "" #define DEFAULT_POPUP_INFO "" +#define ICON_SIZE 125 + struct _AnacondaDiskOverviewPrivate { GtkWidget *vbox; GtkWidget *kind; @@ -195,7 +197,7 @@ static void anaconda_disk_overview_init(AnacondaDiskOverview *widget) { /* Create the spoke's icon. */ widget->priv->kind = gtk_image_new_from_icon_name(DEFAULT_KIND, GTK_ICON_SIZE_DIALOG); - gtk_image_set_pixel_size(GTK_IMAGE(widget->priv->kind), 200); + gtk_image_set_pixel_size(GTK_IMAGE(widget->priv->kind), ICON_SIZE); /* Create the description label. */ widget->priv->description_label = gtk_label_new(NULL); @@ -282,7 +284,7 @@ static void anaconda_disk_overview_set_property(GObject *object, guint prop_id, case PROP_KIND: gtk_image_set_from_icon_name(GTK_IMAGE(priv->kind), g_value_get_string(value), GTK_ICON_SIZE_DIALOG); - gtk_image_set_pixel_size(GTK_IMAGE(priv->kind), 200); + gtk_image_set_pixel_size(GTK_IMAGE(priv->kind), ICON_SIZE); break; case PROP_CAPACITY: { -- 1.7.6

2 3

[PATCH] lorax: Don't touch /etc/mtab in cleanup
by Brian C. Lane 09 Jan '12

09 Jan '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- share/runtime-cleanup.tmpl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl index fb348ab..546009c 100644 --- a/share/runtime-cleanup.tmpl +++ b/share/runtime-cleanup.tmpl @@ -358,4 +358,5 @@ runcmd find ${root} -name "*.pyc" -type f -exec ln -sf /dev/null {} \; ## remove any broken links in /etc, /usr, /lib ## (broken systemd service links lead to confusing noise at boot) ## NOTE: not checking /var because we want to keep /var/run -runcmd chroot ${root} find -L /etc /usr /lib -xdev -type l -delete +## NOTE: Excluding /etc/mtab which links to /proc/self/mounts for systemd +runcmd chroot ${root} find -L /etc /usr /lib -xdev -type l -and \! -name "mtab" -delete -- 1.7.6.4

2 1

[newui] Beginnings of storage spoke, disk selection (revised)
by David Lehman 06 Jan '12

06 Jan '12

Changes since last time: Added basic handling for customize checkbutton. A bunch of little ui cleanups requested by clumens in response to the first set of patches. Trimmed non-top-level objects from builderObjects lists in storage spoke. Added a Platform call to dmidecode to the list of places we catch exceptions caused by not being root. A bunch of little tweaks to the storage spoke, including: - add description to FakeDisk - use disk.description in DiskOverview instead of vendor+model - fix conditional for choosing between install options dialogs 2, 3 - change bold text in install options dialogs to match mockups - include disk name and serial in tooltip for DiskOverview - change fake sw space req to 12000MB to add options given fake disks

2 6

[PATCH newui] Mark more strings for translation.
by Chris Lumens 06 Jan '12

06 Jan '12

--- pyanaconda/ui/gui/__init__.py | 3 ++- pyanaconda/ui/gui/categories/__init__.py | 4 +++- pyanaconda/ui/gui/categories/localization.py | 4 +++- pyanaconda/ui/gui/categories/software.py | 4 +++- pyanaconda/ui/gui/hubs/__init__.py | 9 ++++++--- pyanaconda/ui/gui/spokes/language.py | 8 ++++++-- pyanaconda/ui/gui/spokes/software.py | 8 ++++++-- pyanaconda/ui/gui/spokes/source.py | 14 +++++++++----- widgets/src/BaseWindow.c | 4 ++-- widgets/src/DiskOverview.c | 8 ++++---- widgets/src/SpokeSelector.c | 4 ++-- widgets/src/intl.h | 1 + 12 files changed, 47 insertions(+), 24 deletions(-) diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index c0ad531..ca08edc 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -84,7 +84,8 @@ class GraphicalUserInterface(UserInterface): self._actions[0].setup() self._actions[0].window.set_beta(not isFinal) - self._actions[0].window.set_property("distribution", _("%s %s INSTALLATION") % (productName, productVersion)) + self._actions[0].window.set_property("distribution", _("%(productName)s %(productVersion)s INSTALLATION") % \ + {"productName": productName, "productVersion": productVersion}) self._actions[0].window.show_all() Gtk.main() diff --git a/pyanaconda/ui/gui/categories/__init__.py b/pyanaconda/ui/gui/categories/__init__.py index 10b6d25..31739d7 100644 --- a/pyanaconda/ui/gui/categories/__init__.py +++ b/pyanaconda/ui/gui/categories/__init__.py @@ -19,6 +19,8 @@ # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> # +N_ = lambda x: x + from pyanaconda.ui.gui import collect __all__ = ["SpokeCategory", "collect_categories"] @@ -38,7 +40,7 @@ class SpokeCategory(object): the grid. """ displayOnHub = None - title = "DEFAULT TITLE" + title = N_("DEFAULT TITLE") def grid(self, selectors): """Construct a Gtk.Grid consisting of two columns from the provided diff --git a/pyanaconda/ui/gui/categories/localization.py b/pyanaconda/ui/gui/categories/localization.py index 787f4d2..577efdc 100644 --- a/pyanaconda/ui/gui/categories/localization.py +++ b/pyanaconda/ui/gui/categories/localization.py @@ -19,6 +19,8 @@ # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> # +N_ = lambda x: x + from pyanaconda.ui.gui.categories import SpokeCategory from pyanaconda.ui.gui.hubs.summary import SummaryHub @@ -26,4 +28,4 @@ __all__ = ["LocalizationCategory"] class LocalizationCategory(SpokeCategory): displayOnHub = SummaryHub - title = "LOCALIZATION" + title = N_("LOCALIZATION") diff --git a/pyanaconda/ui/gui/categories/software.py b/pyanaconda/ui/gui/categories/software.py index b0e2c5b..0b84499 100644 --- a/pyanaconda/ui/gui/categories/software.py +++ b/pyanaconda/ui/gui/categories/software.py @@ -19,6 +19,8 @@ # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> # +N_ = lambda x: x + from pyanaconda.ui.gui.categories import SpokeCategory from pyanaconda.ui.gui.hubs.summary import SummaryHub @@ -26,4 +28,4 @@ __all__ = ["SoftwareCategory"] class SoftwareCategory(SpokeCategory): displayOnHub = SummaryHub - title = "SOFTWARE" + title = N_("SOFTWARE") diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py index 9a2e3ac..bb559d5 100644 --- a/pyanaconda/ui/gui/hubs/__init__.py +++ b/pyanaconda/ui/gui/hubs/__init__.py @@ -19,6 +19,9 @@ # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> # +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) + from pyanaconda.ui.gui import UIObject from pyanaconda.ui.gui.categories import collect_categories from pyanaconda.ui.gui.spokes import StandaloneSpoke, collect_spokes @@ -116,7 +119,7 @@ class Hub(UIObject): # And then create its associated selector, and set some default # values that affect its display on the hub. - selector = AnacondaWidgets.SpokeSelector(spoke.title, spoke.icon) + selector = AnacondaWidgets.SpokeSelector(_(spoke.title), spoke.icon) selector.set_property("status", spoke.status) selector.set_incomplete(not spoke.completed) self._handleCompleteness(spoke) @@ -133,7 +136,7 @@ class Hub(UIObject): if not selectors: continue - label = Gtk.Label("%s" % obj.title) + label = Gtk.Label("%s" % _(obj.title)) label.set_use_markup(True) label.set_halign(Gtk.Align.START) label.set_margin_bottom(12) @@ -162,7 +165,7 @@ class Hub(UIObject): if len(self._incompleteSpokes) == 0: self.window.clear_info() else: - self.window.set_info(Gtk.MessageType.WARNING, "Please complete items marked with this icon first.") + self.window.set_info(Gtk.MessageType.WARNING, _("Please complete items marked with this icon first.")) def setup(self): UIObject.setup(self) diff --git a/pyanaconda/ui/gui/spokes/language.py b/pyanaconda/ui/gui/spokes/language.py index 3a92374..0b9d0a2 100644 --- a/pyanaconda/ui/gui/spokes/language.py +++ b/pyanaconda/ui/gui/spokes/language.py @@ -19,6 +19,10 @@ # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> # +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) +N_ = lambda x: x + from gi.repository import Gtk from pyanaconda.ui.gui import UIObject @@ -52,7 +56,7 @@ class LanguageSpoke(NormalSpoke): category = LocalizationCategory icon = "accessories-character-map" - title = "LANGUAGE" + title = N_("LANGUAGE") def apply(self): pass @@ -65,7 +69,7 @@ class LanguageSpoke(NormalSpoke): @property def status(self): - return "Something selected" + return _("Something selected") def populate(self): NormalSpoke.populate(self) diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py index ed9a5dc..3cb71a4 100644 --- a/pyanaconda/ui/gui/spokes/software.py +++ b/pyanaconda/ui/gui/spokes/software.py @@ -19,6 +19,10 @@ # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> # +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) +N_ = lambda x: x + from gi.repository import Gtk from pyanaconda.ui.gui.spokes import NormalSpoke @@ -34,7 +38,7 @@ class SoftwareSelectionSpoke(NormalSpoke): category = SoftwareCategory icon = "package-x-generic-symbolic" - title = "SOFTWARE SELECTION" + title = N_("SOFTWARE SELECTION") def apply(self): pass @@ -47,7 +51,7 @@ class SoftwareSelectionSpoke(NormalSpoke): def status(self): row = self._get_selected_desktop() if not row: - return "Nothing selected" + return _("Nothing selected") return row[2] diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index d5cefe5..a5a8d8e 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -19,6 +19,10 @@ # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> # +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) +N_ = lambda x: x + import os.path from gi.repository import Gtk, AnacondaWidgets @@ -112,7 +116,7 @@ class SourceSpoke(NormalSpoke): category = SoftwareCategory icon = "media-optical-symbolic" - title = "INSTALL SOURCE" + title = N_("INSTALL SOURCE") def __init__(self, *args, **kwargs): NormalSpoke.__init__(self, *args, **kwargs) @@ -167,7 +171,7 @@ class SourceSpoke(NormalSpoke): @property def completed(self): - return self.status and self.status != "Nothing selected" + return self.status and self.status != _("Nothing selected") @property def status(self): @@ -177,13 +181,13 @@ class SourceSpoke(NormalSpoke): else: return self.data.method.url elif self.data.method.method == "nfs": - return "NFS server %s" % self.data.method.server + return _("NFS server %s") % self.data.method.server elif self.data.method.method == "cdrom": - return "CD/DVD drive" + return _("CD/DVD drive") elif self.data.method.method == "harddrive": return os.path.basename(self._currentIsoFile) else: - return "Nothing selected" + return _("Nothing selected") def _grabObjects(self): self._autodetectButton = self.builder.get_object("autodetectRadioButton") diff --git a/widgets/src/BaseWindow.c b/widgets/src/BaseWindow.c index 63fef9c..44c60ef 100644 --- a/widgets/src/BaseWindow.c +++ b/widgets/src/BaseWindow.c @@ -73,8 +73,8 @@ enum { PROP_WINDOW_NAME }; -#define DEFAULT_DISTRIBUTION "DISTRIBUTION INSTALLATION" -#define DEFAULT_WINDOW_NAME "SPOKE NAME" +#define DEFAULT_DISTRIBUTION N_("DISTRIBUTION INSTALLATION") +#define DEFAULT_WINDOW_NAME N_("SPOKE NAME") struct _AnacondaBaseWindowPrivate { gboolean is_beta, info_shown; diff --git a/widgets/src/DiskOverview.c b/widgets/src/DiskOverview.c index 85ce348..bb78f1d 100644 --- a/widgets/src/DiskOverview.c +++ b/widgets/src/DiskOverview.c @@ -46,9 +46,9 @@ enum { }; /* Defaults for each property. */ -#define DEFAULT_DESCRIPTION "New Device" -#define DEFAULT_KIND "drive-harddisk" -#define DEFAULT_CAPACITY "0 MB" +#define DEFAULT_DESCRIPTION N_("New Device") +#define DEFAULT_KIND N_("drive-harddisk") +#define DEFAULT_CAPACITY N_("0 MB") #define DEFAULT_OS "" #define DEFAULT_POPUP_INFO "" @@ -189,7 +189,7 @@ static void anaconda_disk_overview_init(AnacondaDiskOverview *widget) { /* Create the capacity label. */ widget->priv->capacity_label = gtk_label_new(NULL); - markup = g_markup_printf_escaped("%s", DEFAULT_CAPACITY); + markup = g_markup_printf_escaped("%s", _(DEFAULT_CAPACITY)); gtk_label_set_markup(GTK_LABEL(widget->priv->capacity_label), markup); g_free(markup); diff --git a/widgets/src/SpokeSelector.c b/widgets/src/SpokeSelector.c index 904a15f..92f7fa7 100644 --- a/widgets/src/SpokeSelector.c +++ b/widgets/src/SpokeSelector.c @@ -50,8 +50,8 @@ enum { }; #define DEFAULT_ICON "gtk-missing-image" -#define DEFAULT_STATUS "None" -#define DEFAULT_TITLE "New Selector" +#define DEFAULT_STATUS N_("None") +#define DEFAULT_TITLE N_("New Selector") struct _AnacondaSpokeSelectorPrivate { gboolean is_incomplete; diff --git a/widgets/src/intl.h b/widgets/src/intl.h index 30bca59..b39ee60 100644 --- a/widgets/src/intl.h +++ b/widgets/src/intl.h @@ -24,6 +24,7 @@ #include "gettext.h" #define _(x) gettext(x) +#define N_(String) String #ifdef ENABLE_NLS #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String) -- 1.7.6

1 0

[lorax] Allow specifying buildarch on the command line (#771382)
by Martin Gracik 05 Jan '12

05 Jan '12

Some repos may contain anaconda packages for more architectures, so it's not possible to get the right buildarch. This patch allows optional specifying of the buildarch on the command line when running lorax. If the buildarch is not specified manually, lorax tries to get it from the anaconda package as before. If there's no anaconda package in the repository, don't fallback to the system architecture and continue, because this is pointless. We need the anaconda package. --- src/pylorax/__init__.py | 12 +++++++----- src/sbin/lorax | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index 9d2d229..6db32dd 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -125,7 +125,7 @@ class Lorax(BaseLoraxClass): logger.addHandler(fh) def run(self, ybo, product, version, release, variant="", bugurl="", - isfinal=False, workdir=None, outputdir=None): + isfinal=False, workdir=None, outputdir=None, buildarch=None): assert self._configured @@ -163,8 +163,11 @@ class Lorax(BaseLoraxClass): self.inroot = ybo.conf.installroot logger.debug("using install root: {0}".format(self.inroot)) + if not buildarch: + buildarch = get_buildarch(ybo) + logger.info("setting up build architecture") - self.arch = ArchData(get_buildarch(ybo)) + self.arch = ArchData(buildarch) for attr in ('buildarch', 'basearch', 'libdir'): logger.debug("self.arch.%s = %s", attr, getattr(self.arch,attr)) @@ -252,8 +255,7 @@ def get_buildarch(ybo): buildarch = anaconda.arch break if not buildarch: - # fallback to the system architecture - logger.warning("using system architecture") - buildarch = os.uname()[4] + logger.critical("no anaconda package in the repository") + sys.exit(1) return buildarch diff --git a/src/sbin/lorax b/src/sbin/lorax index 328827e..adf1b1b 100755 --- a/src/sbin/lorax +++ b/src/sbin/lorax @@ -67,6 +67,8 @@ def main(args): help="config file", metavar="STRING") optional.add_option("--proxy", default=None, help="repo proxy url:port", metavar="STRING") + optional.add_option("--buildarch", default=None, + help="build architecture", metavar="STRING") # add the option groups to the parser parser.add_option_group(required) @@ -118,7 +120,7 @@ def main(args): lorax.configure(conf_file=opts.config) lorax.run(yb, opts.product, opts.version, opts.release, opts.variant, opts.bugurl, opts.is_beta, - workdir=tempdir, outputdir=outputdir) + workdir=tempdir, outputdir=outputdir, buildarch=opts.buildarch) def get_yum_base_object(installroot, repositories, mirrorlists=[], -- 1.7.5.4

2 1

[newui] Populate the welcome spoke with translations
by Martin Gracik 05 Jan '12

05 Jan '12

Get the available translations for anaconda and populate the welcome spoke with them. --- pyanaconda/localization.py | 54 +++++++++++++++++++++++++++++++++++ pyanaconda/ui/gui/spokes/welcome.py | 17 +++-------- 2 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 pyanaconda/localization.py diff --git a/pyanaconda/localization.py b/pyanaconda/localization.py new file mode 100644 index 0000000..9f6a9d5 --- /dev/null +++ b/pyanaconda/localization.py @@ -0,0 +1,54 @@ +# Localization classes and functions +# +# Copyright (C) 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): Martin Gracik <mgracik(a)redhat.com> +# + +from collections import namedtuple +import gettext + +import babel + + +Lang = namedtuple('Lang', 'langcode, english_name, display_name') + + +def get_available_translations(domain=None, localedir=None): + domain = domain or gettext._current_domain + localedir = localedir or gettext._default_localedir + + langdict = babel.Locale('en', 'US').languages + messagefiles = gettext.find(domain, localedir, langdict.keys(), all=True) + languages = [path.split(os.path.sep)[-3] for path in messagefiles] + + # usually there are no message files for en_US + if 'en_US' not in languages: + languages.append('en_US') + + for langcode in languages: + try: + locale = babel.Locale.parse(langcode) + except babel.core.UnknownLocaleError: + continue + + # some languages don't have a display_name + display_name = locale.display_name or locale.english_name + # some start with lowercase + display_name = display_name.title() + + yield Lang(langcode, locale.english_name, display_name) diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py index c5d0e1d..1ebef96 100644 --- a/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py @@ -23,6 +23,8 @@ from gi.repository import AnacondaWidgets, Gtk from pyanaconda.ui.gui.hubs.summary import SummaryHub from pyanaconda.ui.gui.spokes import StandaloneSpoke +from pyanaconda.localization import get_available_translations + __all__ = ["WelcomeLanguageSpoke"] class WelcomeLanguageSpoke(StandaloneSpoke): @@ -47,18 +49,9 @@ class WelcomeLanguageSpoke(StandaloneSpoke): completion.set_text_column(1) store = self.builder.get_object("languageStore") - self._addLanguage(store, "English", "English", "en_US") - self._addLanguage(store, "Language A", "Language A", "C") - self._addLanguage(store, "Language B", "Language B", "C") - self._addLanguage(store, "Language C", "Language C", "C") - self._addLanguage(store, "Language D", "Language D", "C") - self._addLanguage(store, "Language E", "Language E", "C") - self._addLanguage(store, "Language F", "Language F", "C") - self._addLanguage(store, "Language G", "Language G", "C") - self._addLanguage(store, "Language H", "Language H", "C") - self._addLanguage(store, "Language I", "Language I", "C") - self._addLanguage(store, "Language J", "Language J", "C") - self._addLanguage(store, "Language K", "Language K", "C") + for trans in get_available_translations: + self._addLanguage(store, trans.display_name, + trans.english_name, trans.langcode) def setup(self): StandaloneSpoke.setup(self) -- 1.7.5.4

2 1

[PATCH] lorax: Add option to exclude packages
by Brian C. Lane 05 Jan '12

05 Jan '12

From: "Brian C. Lane" <bcl(a)redhat.com> Sometimes the repos you are using have broken deps. Now you can exclude packages with -e or --excludepkgs --- src/sbin/lorax | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/sbin/lorax b/src/sbin/lorax index 328827e..be7160c 100755 --- a/src/sbin/lorax +++ b/src/sbin/lorax @@ -67,6 +67,9 @@ def main(args): help="config file", metavar="STRING") optional.add_option("--proxy", default=None, help="repo proxy url:port", metavar="STRING") + optional.add_option("-e", "--excludepkgs", default=[], + action="append", metavar="STRING", + help="package glob to exclude (may be listed multiple times)") # add the option groups to the parser parser.add_option_group(required) @@ -106,7 +109,7 @@ def main(args): os.mkdir(yumtempdir) yb = get_yum_base_object(installtree, opts.source, opts.mirrorlist, - yumtempdir, opts.proxy) + yumtempdir, opts.proxy, opts.excludepkgs) if yb is None: print("error: unable to create the yumbase object", file=sys.stderr) @@ -122,7 +125,7 @@ def main(args): def get_yum_base_object(installroot, repositories, mirrorlists=[], - tempdir="/tmp", proxy=None): + tempdir="/tmp", proxy=None, excludepkgs=[]): def sanitize_repo(repo): if repo.startswith("/"): @@ -160,6 +163,9 @@ def get_yum_base_object(installroot, repositories, mirrorlists=[], if proxy: data["proxy"] = proxy + if excludepkgs: + data["exclude"] = " ".join(excludepkgs) + c.add_section(section) map(lambda (key, value): c.set(section, key, value), data.items()) -- 1.7.6.4

2 1

[LORAX 1/2] better debug, handle relative output paths
by Brian C. Lane 04 Jan '12

04 Jan '12

From: root <root(a)lister.brianlane.com> --- src/pylorax/__init__.py | 1 + src/sbin/lorax | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index 5160e6c..9d2d229 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -23,6 +23,7 @@ # set up logging import logging logger = logging.getLogger("pylorax") +logger.setLevel(logging.DEBUG) sh = logging.StreamHandler() sh.setLevel(logging.INFO) diff --git a/src/sbin/lorax b/src/sbin/lorax index 8d73ac6..328827e 100755 --- a/src/sbin/lorax +++ b/src/sbin/lorax @@ -80,7 +80,7 @@ def main(args): opts, args = parser.parse_args() try: - outputdir = args[0] + outputdir = os.path.abspath(args[0]) except IndexError: parser.error("missing one or more required arguments") -- 1.7.6.4

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel January 2012