Changeset 3668:1ec5672b9db9 in livinglogic.python.xist

Show
Ignore:
Timestamp:
12/30/08 21:20:38 (10 years ago)
Author:
Walter Doerwald <walter@…>
Branch:
default
Message:

Fix handling of the various show options. Swap action and key colors.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • src/ll/make.py

    r3666 r3668  
    19021902 
    19031903s4indent = astyle.Style.fromenv("LL_MAKE_REPRANSI_INDENT", "black:black:bold") 
    1904 s4key = astyle.Style.fromenv("LL_MAKE_REPRANSI_KEY", "green:black") 
    1905 s4action = astyle.Style.fromenv("LL_MAKE_REPRANSI_ACTION", "yellow:black") 
     1904s4key = astyle.Style.fromenv("LL_MAKE_REPRANSI_KEY", "yellow:black") 
     1905s4action = astyle.Style.fromenv("LL_MAKE_REPRANSI_ACTION", "green:black") 
    19061906s4time = astyle.Style.fromenv("LL_MAKE_REPRANSI_TIME", "magenta:black") 
    19071907s4data = astyle.Style.fromenv("LL_MAKE_REPRANSI_DATA", "cyan:black") 
     
    22752275        p.add_option("-C", "--nocolor", dest="color", help="No colored output", action="store_false", default=None) 
    22762276        p.add_option("-g", "--growl", dest="growl", help="Issue growl notification after the build?", action="store_true", default=None) 
    2277         p.add_option("-a", "--showaction", dest="showaction", help="Show actions (%s)?" % ", ".join(actions), choices=actions, default="filephony") 
    2278         p.add_option("-s", "--showstep", dest="showstep", help="Show steps (%s)?" % ", ".join(actions), choices=actions, default=None) 
    2279         p.add_option("-n", "--shownote", dest="shownote", help="Show notes (%s)?" % ", ".join(actions), choices=actions, default=None) 
    2280         p.add_option("-r", "--showregistration", dest="showregistration", help="Show registration (%s)?" % ", ".join(actions), choices=actions, default="none") 
    2281         p.add_option("-i", "--showidle", dest="showidle", help="Show actions that didn't produce data?", action="store_true", default=False) 
    2282         p.add_option("-d", "--showdata", dest="showdata", help="Show data?", action="store_true", default=False) 
     2277        p.add_option("-a", "--showaction", dest="showaction", help="Show actions (%s)?" % ", ".join(actions), choices=actions, default=self.showaction) 
     2278        p.add_option("-s", "--showstep", dest="showstep", help="Show steps (%s)?" % ", ".join(actions), choices=actions, default=self.showstep) 
     2279        p.add_option("-n", "--shownote", dest="shownote", help="Show notes (%s)?" % ", ".join(actions), choices=actions, default=self.shownote) 
     2280        p.add_option("-r", "--showregistration", dest="showregistration", help="Show registration (%s)?" % ", ".join(actions), choices=actions, default=self.showregistration) 
     2281        p.add_option("-i", "--showidle", dest="showidle", help="Show actions that didn't produce data?", action="store_true", default=self.showidle) 
     2282        p.add_option("-d", "--showdata", dest="showdata", help="Show data?", action="store_true", default=self.showdata) 
    22832283        return p 
    22842284 
     
    22952295        if options.color is not None: 
    22962296            self.color = options.color 
    2297         if options.growl is not None: 
     2297        if self.growl is not None: 
    22982298            self.growl = options.growl 
    2299         if options.showaction is not None: 
    2300             self.showaction = options.showaction 
    2301         if options.showstep is not None: 
    2302             self.showstep = options.showstep 
    2303         if options.shownote is not None: 
    2304             self.shownote = options.shownote 
    2305         if options.showregistration is not None: 
    2306             self.showregistration = options.showregistration 
     2299        self.showaction = options.showaction 
     2300        self.showstep = options.showstep 
     2301        self.shownote = options.shownote 
     2302        self.showregistration = options.showregistration 
    23072303        self.showidle = options.showidle 
    23082304        self.showdata = options.showdata