[gentoo-commits] proj/anaconda:master commit in: gentoo/

["Wiktor W Brodlo" <wiktor@brodlo.net>]

commit:     92f2860c04884cdf48117c2b97f7fcc91864ab6d
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul  8 15:55:47 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul  8 15:55:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=92f2860c

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)
         
     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])