autobuild 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02fbd561a58e387234abbd68df3dcc0cfdad031d
-  data.tar.gz: 4a64a4a2c63cd4d91782577167c92e31f863e14c
+  metadata.gz: 22c8d45a3b5f47a9c2e2544358bc594b3eb5dfe2
+  data.tar.gz: 5f1ccfc0fe622f6c17ab2eabc0c3d90c258af70d
 SHA512:
-  metadata.gz: 843b80f0b1e84fbf70f687ba6ec597bafa249b14b0dba06c4886d8e6b5874f315a3ba4055df40360f6279f6f3c5eaedf8cd662c0778f9e211c25b98acccbb181
-  data.tar.gz: c018435f7acc876f5c9d0e4e0aa9acbb97c0842d7646eaabf62e64520765bff3e623ccca22a3dbedfb3fb1bc9bf3d9fc25a8c2e0e5c7df9d777816187482e941
+  metadata.gz: 549a6b22ef745f3e0927250b7eb983afa681c08198ccf3f7814bc1299be9f5d29060237e43f35bf30f5986b86472fece8df17e0bb9aa2ede01b4837ec6d5a7e9
+  data.tar.gz: 2e49c8313b488d6b3f7c8930fccbc2d64df77ba03ed529a1e27ec0e447438fa931103a47d45ff61680bdff62edc78ebce1cdbc5d18db3d8920165846dfb896f5

data/lib/autobuild/importer.rb

@@ -284,14 +284,14 @@ class Importer
     def apply(package, path, patch_level = 0);   call_patch(package, false, path, patch_level) end
     def unapply(package, path, patch_level = 0); call_patch(package, true, path, patch_level)   end
 
-    def parse_patch_list(package, patches_file)
+    def parse_patch_list(patches_file)
         File.readlines(patches_file).map do |line| 
             line = line.rstrip
             if line =~ /^(.*)\s+(\d+)$/
-                path = File.expand_path($1, package.srcdir)
+                path = $1
                 level = Integer($2)
             else
-                path = File.expand_path(line, package.srcdir)
+                path = line
                 level = 0
             end
             [path, level, File.read(path)]
@@ -301,12 +301,12 @@ class Importer
     def currently_applied_patches(package)
         patches_file = patchlist(package)
         if File.exists?(patches_file)
-            return parse_patch_list(package, patches_file)
+            return parse_patch_list(patches_file)
         end
 
         patches_file = File.join(package.importdir, "patches-autobuild-stamp")
         if File.exists?(patches_file)
-            cur_patches = parse_patch_list(package, patches_file)
+            cur_patches = parse_patch_list(patches_file)
             save_patch_state(package, cur_patches)
             FileUtils.rm_f patches_file
             return currently_applied_patches(package)
@@ -319,9 +319,7 @@ class Importer
         # Get the list of already applied patches
         cur_patches = currently_applied_patches(package)
 
-        cur_patches_state = cur_patches.map { |_, level, content| [level, content] }
-        patches_state     = patches.map { |_, level, content| [level, content] }
-        if cur_patches_state == patches_state
+        if cur_patches.map(&:last) == patches.map(&:last)
             return false
         end
 
@@ -359,18 +357,14 @@ class Importer
         patch_dir = patchdir(package)
         FileUtils.mkdir_p patch_dir
         cur_patches = cur_patches.each_with_index.map do |(path, level, content), idx|
-            path = File.join(patch_dir, idx.to_s)
-            File.open(path, 'w') do |patch_io|
-                patch_io.write content
-            end
-            [path, level]
+        path = File.join(patch_dir, idx.to_s)
+        File.open(path, 'w') do |patch_io|
+            patch_io.write content
+        end
+        [path, level]
         end
         File.open(patchlist(package), 'w') do |f|
-            patch_state = cur_patches.map do |path, level|
-                path = Pathname.new(path).relative_path_from(package.srcdir).to_s
-                "#{path} #{level}"
-            end
-            f.write(patch_state.join("\n"))
+            f.write(cur_patches.map { |p, l| "#{p} #{l}" }.join("\n"))
         end
     end
 

data/lib/autobuild/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Sylvain Joyeux