From fc9e5a5af8f6034fc1ee50fa866ab01cd3f57859 Mon Sep 17 00:00:00 2001
From: Christian Nelson <christian@carbonfive.com>
Date: Mon, 2 Jan 2012 16:39:14 -0800
Subject: [PATCH] Merge in @metaskills patch to take it for a spin.

---
 lib/less/rails/import_processor.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/less/rails/import_processor.rb b/lib/less/rails/import_processor.rb
index 23fcc2c..42d7b49 100644
--- a/lib/less/rails/import_processor.rb
+++ b/lib/less/rails/import_processor.rb
@@ -10,14 +10,17 @@ def prepare
       def evaluate(context, locals, &block)
         import_paths = data.scan(IMPORT_SCANNER).flatten.compact.uniq
         import_paths.each do |path|
-          asset = context.environment[path]
-          if asset && asset.pathname.to_s.ends_with?('.less')
-            context.depend_on_asset(asset.pathname)
+          pathname = begin
+                       context.resolve(path)
+                     rescue FileNotFound
+                       nil
+                     end
+          if pathname && pathname.to_s.ends_with?('.less')
+            context.depend_on(path)
           end
         end
         data
       end
-      
     end
   end
 end