lib/bpm/package.rb in bpm-1.0.0.rc.2 vs lib/bpm/package.rb in bpm-1.0.0.rc.3

@@ -399,21 +399,15 @@
     end
 
     # TODO: Make better errors
     # TODO: This might not work well with conflicting versions
     def local_deps(search_paths=nil)
-      # Using the packages directory is deprecated
-      packages_path = File.join(root_path, "packages")
-      search_paths ||= [File.join(root_path, "vendor"), packages_path]
+      search_paths ||= [File.join(root_path, "vendor"), File.join(root_path, "packages")]
 
       dependencies.inject([]) do |list, (name, version)|
         packages = search_paths.map{|p| Package.new(File.join(p, name)) }.select{|p| p.has_json? }
 
         raise "Can't find package #{name} required in #{self.name}" if packages.empty?
-
-        if packages.any?{|p| p.root_path =~ /^#{Regexp.escape(packages_path)}\// }
-          BPM.deprecation_warning "Use the vendor directory instead of the packages directory for #{root_path}"
-        end
 
         packages.each{|p| p.load_json }
 
         unless satisfied_by?(version, package.version)
           raise "#{name} (#{package.version}) doesn't match #{version} required in #{self.name}"