gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1056787 - in /gump/trunk: ./ python/gump/actor/rdf/describer.py python/gump/core/run/gumpenv.py python/gump/core/update/bzr.py python/gump/core/update/darcs.py python/gump/core/update/hg.py
Date Sat, 08 Jan 2011 20:18:18 GMT
Author: bodewig
Date: Sat Jan  8 20:18:17 2011
New Revision: 1056787

URL: http://svn.apache.org/viewvc?rev=1056787&view=rev
Log:
merge Sander's fixes from the live branch

Modified:
    gump/trunk/   (props changed)
    gump/trunk/python/gump/actor/rdf/describer.py
    gump/trunk/python/gump/core/run/gumpenv.py
    gump/trunk/python/gump/core/update/bzr.py   (props changed)
    gump/trunk/python/gump/core/update/darcs.py   (props changed)
    gump/trunk/python/gump/core/update/hg.py   (props changed)

Propchange: gump/trunk/
------------------------------------------------------------------------------
    svn:mergeinfo = /gump/live:1054907

Modified: gump/trunk/python/gump/actor/rdf/describer.py
URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/actor/rdf/describer.py?rev=1056787&r1=1056786&r2=1056787&view=diff
==============================================================================
--- gump/trunk/python/gump/actor/rdf/describer.py (original)
+++ gump/trunk/python/gump/actor/rdf/describer.py Sat Jan  8 20:18:17 2011
@@ -36,14 +36,14 @@ from gump.core.model.module import *
 from gump.core.model.state import *
 from gump.util import *
 
-from rdflib.URIRef import URIRef
-from rdflib.Literal import Literal
-from rdflib.BNode import BNode
-from rdflib.Namespace import Namespace
-from rdflib.constants import TYPE
+from rdflib import URIRef
+from rdflib import Literal
+from rdflib import BNode
+from rdflib import Namespace
+from rdflib import TYPE
 
 # Import RDFLib's default TripleStore implementation.
-from rdflib.TripleStore import TripleStore
+from rdflib import TripleStore
 
 class RDFDescriber(AbstractRunActor):
     

Modified: gump/trunk/python/gump/core/run/gumpenv.py
URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/core/run/gumpenv.py?rev=1056787&r1=1056786&r2=1056787&view=diff
==============================================================================
--- gump/trunk/python/gump/core/run/gumpenv.py (original)
+++ gump/trunk/python/gump/core/run/gumpenv.py Sat Jan  8 20:18:17 2011
@@ -414,8 +414,8 @@ class GumpEnvironment(Annotatable, Worka
 
     def _check_nant(self):
         if not self.checked:
-            if not self._checkWithDashVersion('NAnt', "no NAnt builds"):
-                if not self._checkWithDashVersion('NAnt.exe', "no NAnt builds"):
+            if not self._checkWithDashVersion('NAnt', "no NAnt builds", '-help'):
+                if not self._checkWithDashVersion('NAnt.exe', "no NAnt builds", '-help'):
                     self.noNAnt = self._checkWithDashVersion('nant',
                                                              "no NAnt builds",
                                                              '-help')

Propchange: gump/trunk/python/gump/core/update/bzr.py
            ('svn:mergeinfo' removed)

Propchange: gump/trunk/python/gump/core/update/darcs.py
            ('svn:mergeinfo' removed)

Propchange: gump/trunk/python/gump/core/update/hg.py
            ('svn:mergeinfo' removed)



Mime
View raw message