lib/autobuild/importer.rb in autobuild-1.5.32 vs lib/autobuild/importer.rb in autobuild-1.5.33

@@ -86,11 +86,11 @@
                     package.progress "updating %s"
                     begin
                         update(package)
                         patch(package)
                         package.updated = true
-                    rescue Exception => e
+                    rescue ::Exception => e
                         fallback(e, package, :import, package)
                     end
                 else
                     if Autobuild.verbose
                         puts "  not updating #{package.name}"
@@ -108,11 +108,11 @@
                 patch(package)
                 package.updated = true
             rescue Autobuild::Exception => e
                 FileUtils.rm_rf package.srcdir
                 fallback(e, package, :import, package)
-            rescue Exception
+            rescue ::Exception
                 package.progress "checkout of %s failed, deleting the source directory #{package.srcdir}"
                 FileUtils.rm_rf package.srcdir
                 raise
             end
         end
@@ -139,10 +139,10 @@
     end
 
     def call_patch(package, reverse, file)
         patch = Autobuild.tool('patch')
         Dir.chdir(package.srcdir) do
-            Subprocess.run(package, :patch, patch, '-p0', (reverse ? '-R' : nil), "<#{file}")
+            Subprocess.run(package, :patch, patch, '-p0', (reverse ? '-R' : nil), :input => file)
         end
     end
 
     def apply(package, path);   call_patch(package, false, path) end
     def unapply(package, path); call_patch(package, true, path)   end