autobuild 1.5.55 → 1.5.56

data/Changes.txt

@@ -1,3 +1,7 @@
+== Version 1.5.55
+* quickfix release
+* last attempt to fix the same issue than in 1.5.55 and 1.5.54
+
 == Version 1.5.55
 * quickfix release
 * really fix update vs. patching problem. The issue was related to patches

data/lib/autobuild/import/archive.rb

@@ -145,6 +145,9 @@ module Autobuild
 
         def checkout(package) # :nodoc:
             update_cache(package)
+            # Un-apply any existing patch so that, when the files get
+            # overwritten by the new checkout, the patch are re-applied
+            patch(package, [])
 
             base_dir = File.dirname(package.srcdir)
 
@@ -171,11 +174,6 @@ module Autobuild
                 Subprocess.run(package, :import, Autobuild.tool('tar'), *cmd)
             end
 
-            # This method can be used to re-checkout an existing package /
-            # directory. If we successfully did that, make sure we delete the
-            # patch list so that it gets re-patched
-            FileUtils.rm_f(patchlist(package))
-
         rescue OpenURI::HTTPError
             raise Autobuild::Exception.new(package.name, :import)
         rescue SubcommandFailed

data/lib/autobuild/importer.rb

@@ -154,7 +154,7 @@ class Importer
     def apply(package, path);   call_patch(package, false, path) end
     def unapply(package, path); call_patch(package, true, path)   end
 
-    def patch(package)
+    def patch(package, patches = self.patches)
         # Get the list of already applied patches
         patches_file = patchlist(package)
         cur_patches =   if !File.exists?(patches_file) then []

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.55" unless defined? Autobuild::VERSION
+    VERSION = "1.5.56" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 109
+  hash: 115
   prerelease: 
   segments: 
   - 1
   - 5
-  - 55
-  version: 1.5.55
+  - 56
+  version: 1.5.56
 platform: ruby
 authors: 
 - Sylvain Joyeux