From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QfDPm-0000FC-OB for garchives@archives.gentoo.org; Fri, 08 Jul 2011 15:56:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3862E0630; Fri, 8 Jul 2011 15:56:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7DDE2E0630 for ; Fri, 8 Jul 2011 15:56:18 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EAD862AC0EC for ; Fri, 8 Jul 2011 15:56:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 558128003D for ; Fri, 8 Jul 2011 15:56:17 +0000 (UTC) From: "Wiktor W Brodlo" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Wiktor W Brodlo" Message-ID: <92f2860c04884cdf48117c2b97f7fcc91864ab6d.wiktor@gentoo> Subject: [gentoo-commits] proj/anaconda:master commit in: gentoo/ X-VCS-Repository: proj/anaconda X-VCS-Files: gentoo/utils.py X-VCS-Directories: gentoo/ X-VCS-Committer: wiktor X-VCS-Committer-Name: Wiktor W Brodlo X-VCS-Revision: 92f2860c04884cdf48117c2b97f7fcc91864ab6d Date: Fri, 8 Jul 2011 15:56:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 24f16eb35d065e6dcd5c14b49ef33746 commit: 92f2860c04884cdf48117c2b97f7fcc91864ab6d Author: wiktor w brodlo brodlo net> AuthorDate: Fri Jul 8 15:55:47 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Fri Jul 8 15:55:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;= a=3Dcommit;h=3D92f2860c gentoo/utils.py: makeconf_factory: FORMAT not TUPLE! --- 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) =20 def makeconf_factory(self, settings, arch): - cflags =3D ("-march=3D%s -O%s", settings.makeconf_march, setting= s.makeconf_opt) + cflags =3D "-march=3D%s -O%s" % (settings.makeconf_march, settin= gs.makeconf_opt) if settings.makeconf_pipe: cflags +=3D " -pipe" - cflags =3D ("CFLAGS=3D\"%s\"", cflags) + cflags =3D "CFLAGS=3D\"%s\"" % cflags =20 cxxflags =3D "CXXFLAGS=3D\"${CFLAGS}\"" =20 if arch =3D=3D "amd64": arch =3D "x86_64" - chost =3D ("CHOST=3D\"%s-pc-linux-gnu\"", arch) + chost =3D "CHOST=3D\"%s-pc-linux-gnu\"" % arch =20 if settings.makeconf_jobs =3D=3D 0: makeopts =3D "-j" else: - makeopts =3D ("-j%i", settings.makeconf_jobs) + makeopts =3D "-j%i" % settings.makeconf_jobs if settings.makeconf_load > 0: - makeopts +=3D (" -l%i", settings.makeconf_jobs) + makeopts +=3D " -l%i" % settings.makeconf_jobs if settings.makeconf_silent: makeopts +=3D " -s" - makeopts =3D ("MAKEOPTS=3D\"%s\"", makeopts) + makeopts =3D "MAKEOPTS=3D\"%s\"" % makeopts =20 - gentoo_mirrors =3D ("GENTOO_MIRRORS=3D\"%s\"", " ".join(settings= .mirrors)) - sync =3D ("SYNC=3D\"%s\"", " ".join(settings.mirrors_sync)) - use =3D ("USE=3D\"%s\"", " ".join(settings.use_flags)) + gentoo_mirrors =3D "GENTOO_MIRRORS=3D\"%s\"" % " ".join(settings= .mirrors) + sync =3D "SYNC=3D\"%s\"" % " ".join(settings.mirrors_sync) + use =3D "USE=3D\"%s\"" % " ".join(settings.use_flags) =20 return "\n".join([cflags, cxxflags, chost, makeopts, gentoo_mirr= ors, sync, use]) =20