gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: rev 36635 - in gump/trunk/python/gump: build document/xdocs integration process run update
Date Thu, 19 Aug 2004 21:01:15 GMT
Author: ajack
Date: Thu Aug 19 14:01:14 2004
New Revision: 36635

Modified:
   gump/trunk/python/gump/build/builder.py
   gump/trunk/python/gump/document/xdocs/xdoc.py
   gump/trunk/python/gump/integration/cvs.py
   gump/trunk/python/gump/integration/depot.py
   gump/trunk/python/gump/process/launcher.py
   gump/trunk/python/gump/run/gumprun.py
   gump/trunk/python/gump/update/artifact.py
   gump/trunk/python/gump/update/cvs.py
Log:
Some debug tweaks, and one fix for repo scanning.

Modified: gump/trunk/python/gump/build/builder.py
==============================================================================
--- gump/trunk/python/gump/build/builder.py	(original)
+++ gump/trunk/python/gump/build/builder.py	Thu Aug 19 14:01:14 2004
@@ -435,7 +435,7 @@
                     jar.setPath(path)
                 else:
                     log.info('Failed to find artifact for id %s (Gump Repo has %s)' % \
-                            (id, artifact.keys()))
+                            (id, artifacts.keys()))
                             
                     artifactsOk=False
                     break

Modified: gump/trunk/python/gump/document/xdocs/xdoc.py
==============================================================================
--- gump/trunk/python/gump/document/xdocs/xdoc.py	(original)
+++ gump/trunk/python/gump/document/xdocs/xdoc.py	Thu Aug 19 14:01:14 2004
@@ -722,7 +722,7 @@
     def __init__(self,title,output=None,config=None,rootpath='.'):
         if isinstance(output,types.StringTypes):    
             self.xfile=output
-            log.debug('Documenting to file : [' + self.xfile + ']')                    
+            #log.debug('Documenting to file : [' + self.xfile + ']')                    
             # Open for writing with a decent sized buffer.
             self.output=open(self.xfile, 'w', 4096)
         else:

Modified: gump/trunk/python/gump/integration/cvs.py
==============================================================================
--- gump/trunk/python/gump/integration/cvs.py	(original)
+++ gump/trunk/python/gump/integration/cvs.py	Thu Aug 19 14:01:14 2004
@@ -91,8 +91,9 @@
             logins[root]=newpass
                     
         else:
-            log.debug('Login already available for: ' + repository.getName() \
-                    + ' @ ' + root)            
+            pass
+            #log.debug('Login already available for: ' + repository.getName() \
+            #        + ' @ ' + root)            
     else:
         log.warn('Unable to provide login for CVS repository: ' + repository.getName() \
                 + ' @ ' + root + ' method: ' + str(repository.getMethod()) )  

Modified: gump/trunk/python/gump/integration/depot.py
==============================================================================
--- gump/trunk/python/gump/integration/depot.py	(original)
+++ gump/trunk/python/gump/integration/depot.py	Thu Aug 19 14:01:14 2004
@@ -57,8 +57,7 @@
     cmd.addParameter('-rs','gump')
         
     # Target
-    cmd.addParameter('-t')
-    cmd.addParameter(repository)  
+    cmd.addParameter('-t',repository)  
    
     return cmd    
     

Modified: gump/trunk/python/gump/process/launcher.py
==============================================================================
--- gump/trunk/python/gump/process/launcher.py	(original)
+++ gump/trunk/python/gump/process/launcher.py	Thu Aug 19 14:01:14 2004
@@ -93,9 +93,9 @@
                                     ' >>' + str(outputFile) + ' 2>&1'
                                     
         log.debug('Executing: ' + execString)
-        log.debug('     Exec: ' + str(execFile))
-        log.debug('   Output: ' + str(outputFile))
-        log.debug('Full Exec: ' + fullExec)
+        #log.debug('     Exec: ' + str(execFile))
+        #log.debug('   Output: ' + str(outputFile))
+        #log.debug('Full Exec: ' + fullExec)
         
         # Execute Command & Wait
         systemReturn=os.system(fullExec)

Modified: gump/trunk/python/gump/run/gumprun.py
==============================================================================
--- gump/trunk/python/gump/run/gumprun.py	(original)
+++ gump/trunk/python/gump/run/gumprun.py	Thu Aug 19 14:01:14 2004
@@ -170,7 +170,7 @@
     	"""
         log.debug('Dispatch Event : ' + `event`)        
         for actor in self.actors:
-            log.debug('Dispatch Event : ' + `event` + ' to ' + `actor`)     
+            #log.debug('Dispatch Event : ' + `event` + ' to ' + `actor`)     
             actor._processEvent(event)
         gump.utils.inspectGarbageCollection(`event`)
             
@@ -180,7 +180,7 @@
     	"""
         log.debug('Dispatch Request : ' + `request`)    
         for actor in self.actors:
-            log.debug('Dispatch Request : ' + `request` + ' to ' + `actor`)       
+            #log.debug('Dispatch Request : ' + `request` + ' to ' + `actor`)       
             actor._processRequest(request)
         gump.utils.inspectGarbageCollection(`request`)
             

Modified: gump/trunk/python/gump/update/artifact.py
==============================================================================
--- gump/trunk/python/gump/update/artifact.py	(original)
+++ gump/trunk/python/gump/update/artifact.py	Thu Aug 19 14:01:14 2004
@@ -124,16 +124,16 @@
     
         # The URL (ought be optional)
         if url:
-            cmd.addParameter('-r')    
-            cmd.addParameter(url)
-    
+            cmd.addParameter('-r',url)
+        else:
+            # :TODO: Maybe dodgy...
+            cmd.addParameter('-rs','gump')    
+            
         # Group (mandatory)
-        cmd.addParameter('-g')
-        cmd.addParameter(group)
+        cmd.addParameter('-g',group)
         
         # Target
-        cmd.addParameter('-t')
-        cmd.addParameter(module.getName())  
+        cmd.addParameter('-t',module.getName())  
    
         return cmd
     

Modified: gump/trunk/python/gump/update/cvs.py
==============================================================================
--- gump/trunk/python/gump/update/cvs.py	(original)
+++ gump/trunk/python/gump/update/cvs.py	Thu Aug 19 14:01:14 2004
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-
 # Copyright 2003-2004 The Apache Software Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -65,8 +64,8 @@
             
         """
             
-        log.info('Perform CVS Update on #[' + `module.getPosition()` + \
-                        '] : ' + module.getName())
+        #log.info('Perform CVS Update on #[' + `module.getPosition()` + \
+        #                '] : ' + module.getName())
     
         # Did we 'CVS checkout' already?
         exists	=	os.path.exists(module.getSourceControlStagingDirectory())
@@ -105,11 +104,9 @@
         #  Get the Update Command
         (repository, root, cmd ) = self.getUpdateCommand(module, exists)
                 
-        log.debug("CVS Update Module " + module.getName() + \
-                       ", Repository Name: " + str(module.repository.getName()))
+        #log.debug("CVS Update Module " + module.getName() + \
+        #               ", Repository Name: " + str(module.repository.getName()))
                                         
-        log.debug("CVS Root " + root + " on Repository: " + module.repository.getName())
-        
         # Provide CVS logins, if not already there
         loginToRepositoryOnDemand(repository,root,self.logins)
                
@@ -125,7 +122,8 @@
       
         # Update Context w/ Results  
         if not cmdResult.isOk():              
-            log.error('Failed to checkout/update module: ' + module.name)   
+            log.error('Failed w/ CVS Root ' + root + ' for %s on Repository %s.' \
+                % (module.name, module.repository.getName())) 
             if not exists:     
                 module.changeState(STATE_FAILED,REASON_UPDATE_FAILED)
             else:

---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org


Mime
View raw message