lib/bundler/definition.rb in bundler-1.2.5 vs lib/bundler/definition.rb in bundler-1.3.0.pre

- old
+ new

@@ -3,11 +3,12 @@ module Bundler class Definition include GemHelpers - attr_reader :dependencies, :platforms, :sources, :ruby_version + attr_reader :dependencies, :platforms, :sources, :ruby_version, + :locked_deps def self.build(gemfile, lockfile, unlock) unlock ||= {} gemfile = Pathname.new(gemfile).expand_path @@ -223,10 +224,10 @@ contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match("\r\n") return if @lockfile_contents == contents if Bundler.settings[:frozen] - # TODO: Warn here if we got here. + Bundler.ui.error "Cannot write a changed lockfile while frozen." return end File.open(file, 'wb'){|f| f.puts(contents) } rescue Errno::EACCES