diff options
| author |   wiktor w brodlo <wiktor@brodlo.net> | 2011-07-08 15:55:47 +0000 |
|---|---|---|
| committer | wiktor w brodlo <wiktor@brodlo.net> | 2011-07-08 15:55:47 +0000 |
| commit | 92f2860c04884cdf48117c2b97f7fcc91864ab6d (patch) | |
| tree | 4166916920c6a1034a7c3a8f18500cf4b397a3b2 /gentoo | |
| parent | iw/use_gui.py: forgot a self (diff) | |
| download | anaconda-92f2860c04884cdf48117c2b97f7fcc91864ab6d.tar.gz anaconda-92f2860c04884cdf48117c2b97f7fcc91864ab6d.tar.bz2 anaconda-92f2860c04884cdf48117c2b97f7fcc91864ab6d.zip | |
gentoo/utils.py: makeconf_factory: FORMAT not TUPLE!
Diffstat (limited to 'gentoo')
| -rw-r--r-- | gentoo/utils.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gentoo/utils.py b/gentoo/utils.py index ec8a6bc..227a62f 100644 --- a/gentoo/utils.py +++ b/gentoo/utils.py @@ -1018,30 +1018,30 @@ class GentooInstall: makeconf.write(text) def makeconf_factory(self, settings, arch): - cflags = ("-march=%s -O%s", settings.makeconf_march, settings.makeconf_opt) + cflags = "-march=%s -O%s" % (settings.makeconf_march, settings.makeconf_opt) if settings.makeconf_pipe: cflags += " -pipe" - cflags = ("CFLAGS=\"%s\"", cflags) + cflags = "CFLAGS=\"%s\"" % cflags cxxflags = "CXXFLAGS=\"${CFLAGS}\"" if arch == "amd64": arch = "x86_64" - chost = ("CHOST=\"%s-pc-linux-gnu\"", arch) + chost = "CHOST=\"%s-pc-linux-gnu\"" % arch if settings.makeconf_jobs == 0: makeopts = "-j" else: - makeopts = ("-j%i", settings.makeconf_jobs) + makeopts = "-j%i" % settings.makeconf_jobs if settings.makeconf_load > 0: - makeopts += (" -l%i", settings.makeconf_jobs) + makeopts += " -l%i" % settings.makeconf_jobs if settings.makeconf_silent: makeopts += " -s" - makeopts = ("MAKEOPTS=\"%s\"", makeopts) + makeopts = "MAKEOPTS=\"%s\"" % makeopts - gentoo_mirrors = ("GENTOO_MIRRORS=\"%s\"", " ".join(settings.mirrors)) - sync = ("SYNC=\"%s\"", " ".join(settings.mirrors_sync)) - use = ("USE=\"%s\"", " ".join(settings.use_flags)) + gentoo_mirrors = "GENTOO_MIRRORS=\"%s\"" % " ".join(settings.mirrors) + sync = "SYNC=\"%s\"" % " ".join(settings.mirrors_sync) + use = "USE=\"%s\"" % " ".join(settings.use_flags) return "\n".join([cflags, cxxflags, chost, makeopts, gentoo_mirrors, sync, use]) |