gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r957648 - in /gump/live: ./ python/gump/core/model/project.py python/gump/core/update/bzr.py python/gump/core/update/darcs.py python/gump/core/update/hg.py
Date Thu, 24 Jun 2010 17:42:02 GMT
Author: bodewig
Date: Thu Jun 24 17:42:01 2010
New Revision: 957648

URL: http://svn.apache.org/viewvc?rev=957648&view=rev
Log:
allow wildcards for non-built projects, don't die if wildcard matches multiple outputs

Modified:
    gump/live/   (props changed)
    gump/live/python/gump/core/model/project.py
    gump/live/python/gump/core/update/bzr.py   (props changed)
    gump/live/python/gump/core/update/darcs.py   (props changed)
    gump/live/python/gump/core/update/hg.py   (props changed)

Propchange: gump/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 24 17:42:01 2010
@@ -1 +1 @@
-/gump/trunk:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169
+/gump/trunk:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,957107,957408

Modified: gump/live/python/gump/core/model/project.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/project.py?rev=957648&r1=957647&r2=957648&view=diff
==============================================================================
--- gump/live/python/gump/core/model/project.py (original)
+++ gump/live/python/gump/core/model/project.py Thu Jun 24 17:42:01 2010
@@ -287,7 +287,7 @@ class Project(NamedModelObject, Statable
 
     def expand_outputs(self):
         """ expands glob patterns in output names """
-        if self.built and not self.outputs_expanded:
+        if (self.built or not self.hasBuilder()) and not self.outputs_expanded:
             for output in self.outputs.values():
                 path = output.getPath()
                 log.debug("glob expanding " + path)
@@ -295,7 +295,7 @@ class Project(NamedModelObject, Statable
                 count = len(expansions)
                 if count > 1:
                     self.changeState(STATE_FAILED, REASON_MISSING_OUTPUTS)
-                    self.addError(path + " matched " + count + "  files.")
+                    self.addError("%s matched %d files." % (path, count))
                 elif count == 1:
                     log.debug("replacing " + path + " with " + expansions[0])
                     output.setPath(expansions[0])

Propchange: gump/live/python/gump/core/update/bzr.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 24 17:42:01 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/bzr.py:815848,953630-954169
+/gump/trunk/python/gump/core/update/bzr.py:815848,953630-954169,955387,957107,957408

Propchange: gump/live/python/gump/core/update/darcs.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 24 17:42:01 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/darcs.py:815848,953630-954169
+/gump/trunk/python/gump/core/update/darcs.py:815848,953630-954169,955387,957107,957408

Propchange: gump/live/python/gump/core/update/hg.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 24 17:42:01 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/hg.py:815848,953630-954169
+/gump/trunk/python/gump/core/update/hg.py:815848,953630-954169,955387,957107,957408



Mime
View raw message