svn commit: rev 53804 - in gump/trunk/python/gump: notify rdf update utils

[aj...@apache.org]

Author: ajack
Date: Tue Oct  5 09:13:42 2004
New Revision: 53804

Modified:
   gump/trunk/python/gump/notify/notification.py
   gump/trunk/python/gump/notify/notifier.py
   gump/trunk/python/gump/rdf/describer.py
   gump/trunk/python/gump/update/updater.py
   gump/trunk/python/gump/utils/sync.py
Log:
Some minor tweaks,
1) Trying to detect what file has 0xC3 in XOM (causing Unicode error)
2) Quieting RDF (info -> debug)
3) Ensuring the DIR is set on SVN checkouts.
4) etc.

Modified: gump/trunk/python/gump/notify/notification.py
==============================================================================
--- gump/trunk/python/gump/notify/notification.py	(original)
+++ gump/trunk/python/gump/notify/notification.py	Tue Oct  5 09:13:42 2004
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # Copyright 2003-2004 The Apache Software Foundation
-#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -124,10 +123,10 @@
         
         if self.isFailure():        
             if affected:
-                stream.write('.\nThis issue affects ' + `affected` + ' projects')
+                stream.write('.\nThis issue affects %s projects' % affected)
             
             if duration and duration > 1:
-                stream.write(', and has been outstanding for ' + `duration` + ' runs')
+                stream.write(', and has been outstanding for %s runs' % duration)
         
         stream.write('.\n')
         

Modified: gump/trunk/python/gump/notify/notifier.py
==============================================================================
--- gump/trunk/python/gump/notify/notifier.py	(original)
+++ gump/trunk/python/gump/notify/notifier.py	Tue Oct  5 09:13:42 2004
@@ -270,7 +270,7 @@
                 
         # Form the subject
         subject=self.workspace.prefix+	\
-                ': '+module.getName()+' '+	\
+                ': Module '+module.getName()+' '+	\
                 lower(stateDescription(module.getState()))
                     
         if notification.isWarning():
@@ -289,9 +289,9 @@
         content=notification.resolveContent(self.resolver, self.getNextIdentifier())
                 
         # Form the subject
-        subject=self.workspace.prefix+': '	\
-            + module.getName() + '/' +project.getName()	\
-            +' '+lower(stateDescription(project.getState()))
+        subject=self.workspace.prefix+': Project '+ project.getName()	\
+            + ' (in Module ' + module.getName() + ') ' \
+            + lower(stateDescription(project.getState()))
             
         if notification.isWarning():
             subject += ', but with warnings.'

Modified: gump/trunk/python/gump/rdf/describer.py
==============================================================================
--- gump/trunk/python/gump/rdf/describer.py	(original)
+++ gump/trunk/python/gump/rdf/describer.py	Tue Oct  5 09:13:42 2004
@@ -191,7 +191,7 @@
         """
         Write to the generate store
         """
-        log.info('RDF : %s %s %s [%s]' % (subject,verb,predicate,comment))
+        log.debug('RDF : %s %s %s [%s]' % (subject,verb,predicate,comment))
         # Add to this store
         store.add((subject,verb,predicate))
         # Add globally

Modified: gump/trunk/python/gump/update/updater.py
==============================================================================
--- gump/trunk/python/gump/update/updater.py	(original)
+++ gump/trunk/python/gump/update/updater.py	Tue Oct  5 09:13:42 2004
@@ -183,7 +183,9 @@
                         
         except Exception, details:
             module.changeState(STATE_FAILED,REASON_SYNC_FAILED)
-            log.error('Synchronize Failed ' + str(details), exc_info=1)
+            message='Synchronize Failed: ' + str(details)
+            module.addError(message)
+            log.error(message, exc_info=1)
            
         return module.okToPerformWork()
         

Modified: gump/trunk/python/gump/utils/sync.py
==============================================================================
--- gump/trunk/python/gump/utils/sync.py	(original)
+++ gump/trunk/python/gump/utils/sync.py	Tue Oct  5 09:13:42 2004
@@ -176,9 +176,10 @@
         #
         #
         for name in names:
-            srcname = os.path.join(src, name)
-            dstname = os.path.join(dst, name)
-            try:
+            try:    
+                srcname = os.path.join(src, name)
+                dstname = os.path.join(dst, name)
+                
                 if symlinks and os.path.islink(srcname):
                     linkto = os.readlink(srcname)
                     os.symlink(linkto, dstname)