[DRE-commits] [SCM] ruby-actionpack-3.2.git branch, master-experimental, updated. debian/3.2.6-4-31-ged93e20

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit 65cc41e00676c0164e7a1532c11d650629cf4bb4
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Mar 20 18:49:13 2013 +0100

    Pull fix for a speed regression from https://github.com/rails/rails/issues/9803

diff --git a/debian/patches/0002-fix_sprockets_speed_regression.patch b/debian/patches/0002-fix_sprockets_speed_regression.patch
new file mode 100644
index 0000000..afec4d0
--- /dev/null
+++ b/debian/patches/0002-fix_sprockets_speed_regression.patch
@@ -0,0 +1,11 @@
+--- a/lib/sprockets/helpers/rails_helper.rb
++++ b/lib/sprockets/helpers/rails_helper.rb
+@@ -163,7 +163,7 @@ module Sprockets
+             source
+           elsif source_ext.blank?
+             "#{source}.#{ext}"
+-          elsif exact_match_present?(source)
++          elsif File.exists?(source) || exact_match_present?(source)
+             source
+           else
+             "#{source}.#{ext}"
diff --git a/debian/patches/series b/debian/patches/series
index cdb05ce..2409f3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-loosen_sprockets_dependency.patch
+0002-fix_sprockets_speed_regression.patch

-- 
ruby-actionpack-3.2.git