autobuild 1.5.1 → 1.5.2

data/Changes.txt

@@ -1,3 +1,11 @@
+== Version 1.5.2
+* fix broken mail reporting. The mail report was always saved in a file since
+  1.5.1.
+* fix small bugs in the patching part of the import
+  - be error tolerant: if patching/unpatching fails, we go back to a well
+    defined state instead of having to fix the package by hand
+  - do not apply patches unnecessarily
+
 == Version 1.5.1
 * autotools: must run libtool before the other tools
 * autotools: properly autodetect need for autoconf (autoconf was always enabled

data/lib/autobuild.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.1" unless defined? Autobuild::VERSION
+    VERSION = "1.5.2" unless defined? Autobuild::VERSION
 end
 
 require 'autobuild/config'

data/lib/autobuild/importer.rb

@@ -88,7 +88,7 @@ class Importer
     # We assume that package.srcdir already exists (checkout is supposed to
     # have been called)
     def patchlist(package)
-        "#{package.srcdir}/patches-autobuild-stamp"
+        File.join(package.srcdir, "patches-autobuild-stamp")
     end
 
     def call_patch(package, reverse, file)
@@ -111,6 +111,10 @@ class Importer
                             end
                         end
 
+        if cur_patches == patches
+            return
+        end
+
 	if !patches.empty?
 	    package.progress "patching %s"
 	end
@@ -118,8 +122,9 @@ class Importer
         # Do not be smart, remove all already applied patches
         # and then apply the new ones
         begin
-            while p = cur_patches.pop
+            while p = cur_patches.last
                 unapply(package, p) 
+                cur_patches.pop
             end
 
             patches.to_a.each do |p| 

data/lib/autobuild/package.rb

@@ -142,6 +142,9 @@ module Autobuild
         # Called when the user asked for a full rebuild. It should delete the
         # build products so that a full build is retriggered.
         def prepare_for_rebuild
+            if File.exists?(installstamp)
+                FileUtils.rm_f installstamp
+            end
         end
 
         # Call the importer if there is one. Autodetection of "provides" should

data/lib/autobuild/reporting.rb

@@ -156,7 +156,7 @@ module Autobuild
             end
 
             # Send the mails
-            if File.directory?(File.dirname(smtp_hostname))
+            if smtp_hostname =~ /\// && File.directory?(File.dirname(smtp_hostname))
                 File.open(smtp_hostname, 'w') do |io|
                     io.puts "From: #{from_email}"
                     io.puts "To: #{to_email.join(" ")}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 +01:00
+date: 2010-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency