autobuild 1.6.2.b3 → 1.6.2.b4

data/lib/autobuild/importer.rb

@@ -105,10 +105,9 @@ class Importer
         end
 
         retry_count = 0
+        package.progress_start "updating %s"
         begin
-            package.progress_start "updating %s" do
-                update(package)
-            end
+            update(package)
         rescue Interrupt
             raise
         rescue ::Exception => original_error
@@ -121,6 +120,7 @@ class Importer
             # will have to unpatch by themselves.
             cur_patches = currently_applied_patches(package)
             if !cur_patches.empty?
+                package.progress_done
                 package.message "update failed and some patches are applied, retrying after removing all patches first"
                 begin
                     patch(package, [])
@@ -138,6 +138,8 @@ class Importer
             end
             package.message "update failed in #{package.srcdir}, retrying (#{retry_count}/#{self.retry_count})"
             retry
+        ensure
+            package.progress_done
         end
 
         patch(package)
@@ -261,7 +263,7 @@ class Importer
                 package.message "patching %s: applying #{apply_count} and unapplying #{unapply_count} patch(es)"
             elsif apply_count > 0
                 package.message "patching %s: applying #{apply_count} patch(es)"
-            else
+            elsif unapply_count > 0
                 package.message "patching %s: unapplying #{unapply_count} patch(es)"
             end
 

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.6.2.b3" unless defined? Autobuild::VERSION
+    VERSION = "1.6.2.b4" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.6.2.b3
+  version: 1.6.2.b4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19772240 !ruby/object:Gem::Requirement
+  requirement: &12343900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *19772240
+  version_requirements: *12343900
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &19771740 !ruby/object:Gem::Requirement
+  requirement: &12341940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *19771740
+  version_requirements: *12341940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19771200 !ruby/object:Gem::Requirement
+  requirement: &12336000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,18 +43,18 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *19771200
+  version_requirements: *12336000
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &19770720 !ruby/object:Gem::Requirement
+  requirement: &12334480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *19770720
+  version_requirements: *12334480
 description: Collection of classes to handle build systems (CMake, autotools, ...)
   and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
   to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)