Return-Path: Delivered-To: apmail-gump-general-archive@www.apache.org Received: (qmail 19628 invoked from network); 26 Jun 2004 17:18:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 26 Jun 2004 17:18:06 -0000 Received: (qmail 51645 invoked by uid 500); 26 Jun 2004 17:18:08 -0000 Delivered-To: apmail-gump-general-archive@gump.apache.org Received: (qmail 51416 invoked by uid 500); 26 Jun 2004 17:18:03 -0000 Mailing-List: contact general-help@gump.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Gump code and data" Reply-To: "Gump code and data" Delivered-To: mailing list general@gump.apache.org Received: (qmail 51202 invoked by uid 500); 26 Jun 2004 17:17:59 -0000 Received: (qmail 51003 invoked by uid 99); 26 Jun 2004 17:17:53 -0000 X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Sat, 26 Jun 2004 10:17:52 -0700 Received: (qmail 19549 invoked by uid 1728); 26 Jun 2004 17:17:48 -0000 Date: 26 Jun 2004 17:17:48 -0000 Message-ID: <20040626171748.19548.qmail@minotaur.apache.org> From: ajack@apache.org To: gump-cvs@apache.org Subject: cvs commit: gump/python/gump/core gumpenv.py X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N ajack 2004/06/26 10:17:48 Modified: template/xhtml/css Tag: CleanUp style.css python/gump/document/xdocs Tag: CleanUp documenter.py python/gump/core Tag: CleanUp gumpenv.py Log: Final cosmetic tweaks (for a while) to CSS. Revision Changes Path No revision No revision 1.1.2.8 +1 -1 gump/template/xhtml/css/Attic/style.css Index: style.css =================================================================== RCS file: /home/cvs/gump/template/xhtml/css/Attic/style.css,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- style.css 26 Jun 2004 16:42:42 -0000 1.1.2.7 +++ style.css 26 Jun 2004 17:17:48 -0000 1.1.2.8 @@ -1 +1 @@ -img { border: 0 } HR { color: #8EB4D9; height: 1px; text-align: center; width: 90%; position: relative } TABLE.TRANSPARENT { border: none; width: 100% } TABLE { border: thin solid #000000; width: 100% } /* Annotations */ .DEBUG { background-color: #000000 } .INFO { background-color: #99CC66 } .WARN { background-color: #FFFF99 } .ERROR { background-color: #CC0000 } /* Note and Warning boxes, (WARN from above) */ .NOTE { background-color: #99CC66 } /* State */ .SUCCESS { background-color: #99CC66 } .FAILED { background-color: #CC0000; color: #FFFFFF } .PREREQFAILED { background-color: #FFFF99 } .COMPLETE { background-color: #00CCFF } .UNSET { background-color: #CCCCCC } \ No newline at end of file +img { border: 0 } HR { color: #8EB4D9; height: 1px; text-align: center; width: 90%; position: relative } TABLE.TRANSPARENT { border: none; width: 100% } TABLE { border: thin solid #000000; width: 100% } /* Annotations */ .DEBUG { background-color: #000000; color: #FFFFFF } .INFO { background-color: #99CC66 } .WARNING { background-color: #FFFF99 } .ERROR { background-color: #CC0000; color: #FFFFFF } /* Note and Warning boxes, (WARN from above) */ .NOTE { background-color: #99CC66 } .WARN { background-color: #FFFF99 } /* State */ .SUCCESS { background-color: #99CC66 } .FAILED { background-color: #CC0000; color: #FFFFFF } .PREREQFAILED { background-color: #FFFF99 } .COMPLETE { background-color: #00CCFF } .UNSET { background-color: #CCCCCC } \ No newline at end of file No revision No revision 1.9.2.23 +4 -0 gump/python/gump/document/xdocs/documenter.py Index: documenter.py =================================================================== RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v retrieving revision 1.9.2.22 retrieving revision 1.9.2.23 diff -u -r1.9.2.22 -r1.9.2.23 --- documenter.py 26 Jun 2004 16:42:42 -0000 1.9.2.22 +++ documenter.py 26 Jun 2004 17:17:48 -0000 1.9.2.23 @@ -2197,6 +2197,10 @@ self.insertLink(work,workable,workRow.createData()) workRow.createData(stateDescription(work.state)) + + # Colour... + workRow.setStyle(stateName(work.state).upper()) + if isinstance(work,TimedWorkItem): workRow.createData(secsToDateTime(work.result.start_time)) workRow.createData(secsToElapsedTimeString(work.getElapsedSecs())) No revision No revision 1.6.2.5 +3 -3 gump/python/gump/core/gumpenv.py Index: gumpenv.py =================================================================== RCS file: /home/cvs/gump/python/gump/core/gumpenv.py,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -u -r1.6.2.4 -r1.6.2.5 --- gumpenv.py 20 Jun 2004 19:36:54 -0000 1.6.2.4 +++ gumpenv.py 26 Jun 2004 17:17:48 -0000 1.6.2.5 @@ -133,7 +133,6 @@ self.noDepot=True self.addWarning('DEPOT_HOME environmental variable not found, no depot downloads.') - self.depotHome = getDepotHome(False) # @@ -190,7 +189,8 @@ self.changeState(STATE_SUCCESS) def getJavaProperties(self): - if not self.javaProperties is NoneType: return self.javaProperties + if not isinstance(self.javaProperties,NoneType): + return self.javaProperties self.checkEnvironment() @@ -221,7 +221,7 @@ cmd=self.javaCommand + ' -cp ' + dir.tmp + ' sysprop' self.javaProperties = \ - dict(re.findall('(.*?): (.*)', commands.getoutput(cmd))) + dict(re.findall('(.*?): (.*)', commands.getoutput(cmd))) JAVA_CLASS=JAVA_SOURCE.replace('.java','.class') if os.path.exists(JAVA_CLASS): os.unlink(JAVA_CLASS) --------------------------------------------------------------------- To unsubscribe, e-mail: general-unsubscribe@gump.apache.org For additional commands, e-mail: general-help@gump.apache.org