geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r508642 - in /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library: Library.groovy LibraryManager.groovy
Date Fri, 16 Feb 2007 23:02:25 GMT
Author: jdillon
Date: Fri Feb 16 15:02:24 2007
New Revision: 508642

URL: http://svn.apache.org/viewvc?view=rev&rev=508642
Log:
Allow better handling of failed checkouts

Modified:
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/LibraryManager.groovy

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy?view=diff&rev=508642&r1=508641&r2=508642
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy
Fri Feb 16 15:02:24 2007
@@ -93,8 +93,6 @@
     def remove() {
         log.info "Removing library from: $baseDir"
         
-        assert exists()
-        
         //
         // NOTE: Use native 'rm' for speed, since some libraries can be large
         //       and Ant's mechanism can take forever

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/LibraryManager.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/LibraryManager.groovy?view=diff&rev=508642&r1=508641&r2=508642
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/LibraryManager.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/LibraryManager.groovy
Fri Feb 16 15:02:24 2007
@@ -69,8 +69,18 @@
             }
         }
         else {
-            lib.checkout()
-            lib.lock()
+            try {
+                lib.checkout()
+                lib.lock()
+            }
+            catch (Exception e) {
+                log.error("Checkout failed: $e", e)
+                
+                // Cleanup after a failed checkout
+                if (lib.exists()) {
+                    lib.remove()
+                }
+            }
         }
         
         log.info "Fetched library in $watch"



Mime
View raw message