lib/autoproj/autobuild.rb in autoproj-1.9.0 vs lib/autoproj/autobuild.rb in autoproj-1.9.1
- old
+ new
@@ -297,12 +297,11 @@
(File.read(cmakelists) =~ /PROJECT/i)
end
dir ||= find_topmost_directory_containing(full_path, 'CMakeLists.txt')
return "cmake_package", dir
- elsif !Dir.glob('*.rb').empty?
- dir = find_topmost_directory_containing(full_path, "Rakefile") ||
- find_topmost_directory_containing(full_path, "lib/*.rb")
+ elsif dir = find_topmost_directory_containing(full_path, "Rakefile") ||
+ find_topmost_directory_containing(full_path, "lib/*.rb")
return "ruby_package", dir
end
end
end