浏览代码

Add --nocolor option to forcibly disable output coloring

rdb 16 年之前
父节点
当前提交
2b1f09a032
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 2 1
      makepanda/makepanda.py
  2. 4 0
      makepanda/makepandacore.py

+ 2 - 1
makepanda/makepanda.py

@@ -103,7 +103,7 @@ def parseopts(args):
     global VERSION,COMPRESSOR,THREADCOUNT,OSXTARGET
     longopts = [
         "help","distributor=","verbose","runtime","osxtarget=",
-        "optimize=","everything","nothing","installer","rtdist",
+        "optimize=","everything","nothing","installer","rtdist","nocolor",
         "version=","lzma","no-python","threads=","outputdir=","override="]
     anything = 0
     optimize = ""
@@ -125,6 +125,7 @@ def parseopts(args):
             elif (option=="--threads"): THREADCOUNT=int(value)
             elif (option=="--outputdir"): SetOutputDir(value.strip())
             elif (option=="--osxtarget"): OSXTARGET=value.strip()
+            elif (option=="--nocolor"): DisableColors()
             elif (option=="--version"):
                 VERSION=value
                 if (len(VERSION.split(".")) != 3): raise "usage"

+ 4 - 0
makepanda/makepandacore.py

@@ -120,6 +120,10 @@ try:
   HAVE_COLORS=sys.stdout.isatty()
 except: pass
 
+def DisableColors():
+    global HAVE_COLORS
+    HAVE_COLORS = False
+
 def GetColor(color = None):
     if not HAVE_COLORS: return ""
     if color != None: color = color.lower()