gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1766315 - /gump/live/python/gump/core/model/builder.py
Date Sun, 23 Oct 2016 20:12:31 GMT
Author: bodewig
Date: Sun Oct 23 20:12:30 2016
New Revision: 1766315

URL: http://svn.apache.org/viewvc?rev=1766315&view=rev
Log:
make model responsible for calculating timeout

Modified:
    gump/live/python/gump/core/model/builder.py

Modified: gump/live/python/gump/core/model/builder.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/builder.py?rev=1766315&r1=1766314&r2=1766315&view=diff
==============================================================================
--- gump/live/python/gump/core/model/builder.py (original)
+++ gump/live/python/gump/core/model/builder.py Sun Oct 23 20:12:30 2016
@@ -31,6 +31,7 @@ from gump.util.domutils import domAttrib
     getDomChild, getDomTextValue, hasDomAttribute, hasDomChild, \
     transferDomAttributes
 
+from gump.core.config import setting
 from gump.core.model.depend import INHERIT_NONE, ProjectDependency
 from gump.core.model.object import ModelObject
 from gump.core.model.property import Property, PropertyContainer
@@ -237,7 +238,9 @@ class Builder(ModelObject, PropertyConta
         return False
 
     def getTimeout(self):
-        return self.timeout
+        if self.timeout:
+            return self.timeout
+        return setting.TIMEOUT
 
 # represents an <ant/> element
 class BaseAnt(Builder):



Mime
View raw message