summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-06-06 12:01:07 +0800
committerAndre Arko <andre@arko.net>2015-06-08 00:32:21 -0700
commit4d901fa071a69570011f81e6822950a5bfd7d305 (patch)
treed7d86f03d43c1dfe3c300d8abf23f9c565281299
parent657a66040e7fd11747c19c1ee47a6c5979a77557 (diff)
downloadbundler-4d901fa071a69570011f81e6822950a5bfd7d305.tar.gz
use existing constants to match BUNDLED WITH
-rw-r--r--lib/bundler/definition.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 983bcd043f..81401ff81a 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -1,3 +1,4 @@
+require "bundler/lockfile_parser"
require "digest/sha1"
require "set"
@@ -661,7 +662,7 @@ module Bundler
def lockfiles_equal?(current, proposed, preserve_bundled_with)
if preserve_bundled_with
- pattern = /\n\nBUNDLED WITH\n.*\n/
+ pattern = /\n\n#{LockfileParser::BUNDLED}\n\s+#{Gem::Version::VERSION_PATTERN}\n/
current.sub(pattern, "\n") == proposed.sub(pattern, "\n")
else
current == proposed