svn commit: r156643 - in gump/trunk/python/gump: core/model/module.py util/locks.py

[aj...@apache.org]

Author: ajack
Date: Wed Mar  9 06:00:16 2005
New Revision: 156643

URL: http://svn.apache.org/viewcvs?view=rev&rev=156643
Log:
1) A lock cannot be created in a non-existent directory (ok, but set error message accordingly).
2) Until CVS|SVN (etc.) run successfully once, the directory does not exist -- so store locks one dir above.

Modified:
    gump/trunk/python/gump/core/model/module.py
    gump/trunk/python/gump/util/locks.py

Modified: gump/trunk/python/gump/core/model/module.py
URL: http://svn.apache.org/viewcvs/gump/trunk/python/gump/core/model/module.py?view=diff&r1=156642&r2=156643
==============================================================================
--- gump/trunk/python/gump/core/model/module.py (original)
+++ gump/trunk/python/gump/core/model/module.py Wed Mar  9 06:00:16 2005
@@ -411,7 +411,8 @@
         # For when multiple gump runs share (on posix)
         self.absUpdateLock=    \
                  os.path.abspath(
-                         os.path.join(    self.absSrcCtlDir, 'update.lock'))
+                         os.path.join(    workspace.getSourceControlStagingDirectory(), 
+                                            self.getName() + '.lock'))
                                
         # :TODO: Consolidate this code, less cut-n-paste but also
         # check the 'type' of the repository is appropriate for the

Modified: gump/trunk/python/gump/util/locks.py
URL: http://svn.apache.org/viewcvs/gump/trunk/python/gump/util/locks.py?view=diff&r1=156642&r2=156643
==============================================================================
--- gump/trunk/python/gump/util/locks.py (original)
+++ gump/trunk/python/gump/util/locks.py Wed Mar  9 06:00:16 2005
@@ -40,7 +40,7 @@
             
     if failed:
         raise RuntimeError, \
-            """The lock file [%s] exists, and a lock could not be established.""" % lockFile
+            """The lock file [%s] could not be established.""" % lockFile
     
     # Write this PID into a lock file
     lock.write(`os.getpid()`)