diff options
| author | Samuel E. Giddins <segiddins@segiddins.me> | 2015-05-27 21:24:59 -0700 |
|---|---|---|
| committer | Samuel E. Giddins <segiddins@segiddins.me> | 2015-05-28 10:03:37 -0700 |
| commit | 8f7d9442cce3dd3460119d81963eacc3ad5c3018 (patch) | |
| tree | 62b1d8ccdd641608bb9d56e5990a7c81c428e9e8 /lib/bundler/lockfile_parser.rb | |
| parent | 224828e0d4e3146cf8fc671f0a96476d68bfdd52 (diff) | |
| download | bundler-8f7d9442cce3dd3460119d81963eacc3ad5c3018.tar.gz | |
Print lockfile name relative from the current working directory
Diffstat (limited to 'lib/bundler/lockfile_parser.rb')
| -rw-r--r-- | lib/bundler/lockfile_parser.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/lockfile_parser.rb b/lib/bundler/lockfile_parser.rb index cfa876c2..241a78c6 100644 --- a/lib/bundler/lockfile_parser.rb +++ b/lib/bundler/lockfile_parser.rb @@ -34,8 +34,8 @@ module Bundler @rubygems_aggregate = Source::Rubygems.new if lockfile.match(/<<<<<<<|=======|>>>>>>>|\|\|\|\|\|\|\|/) - raise LockfileError, "Your #{Bundler.default_lockfile} contains merge conflicts.\n" \ - "Run `git checkout HEAD -- #{Bundler.default_lockfile}` first to get a clean lock." + raise LockfileError, "Your #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} contains merge conflicts.\n" \ + "Run `git checkout HEAD -- #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}` first to get a clean lock." end lockfile.split(/(?:\r?\n)+/).each do |line| @@ -59,7 +59,7 @@ module Bundler warn_for_outdated_bundler_version rescue ArgumentError => e Bundler.ui.debug(e) - raise LockfileError, "Your lockfile is unreadable. Run `rm #{Bundler.default_lockfile}` " \ + raise LockfileError, "Your lockfile is unreadable. Run `rm #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}` " \ "and then `bundle install` to generate a new lockfile." end |