Merge branch 'release/2.4.0' into release/2.4.0+

CartoDB · Nov 6, 2013 · d8eba16 · d8eba16
2 parents 4ad34e5 + 130044a
commit d8eba16
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/services/importer/lib/importer/unp.rb b/services/importer/lib/importer/unp.rb
@@ -29,9 +29,7 @@ def initialize
       def run(path)
         return without_unpacking(path) unless compressed?(path)
         extract(path)
-        crawl(temporary_directory)
-          .select { |path| !(path =~ /.*readme.*\.txt/i) }
-          .each   { |path| process(path) }
+        crawl(temporary_directory).each { |path| process(path) }
         @source_files = split(source_files)
         self
       rescue => exception
@@ -59,6 +57,7 @@ def process(path)
       def crawl(path, files=[])
         Dir.foreach(path) do |subpath|
           next if hidden?(subpath)
+          next if subpath =~ /.*readme.*\.txt/i
 
           fullpath = normalize("#{path}/#{subpath}")
           (crawl(fullpath, files) and next) if File.directory?(fullpath)