aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-05-07 11:14:59 +0100
committerAndre Arko <andre@arko.net>2015-05-07 11:14:59 +0100
commitde74bc30e7bb31228b4a25a4b02f69cee06ef76d (patch)
tree4993b01e9e6c0696076e896a3a4022d947eeb543 /lib/bundler
parent18ef78d1018209393f20655b08f2efac97505cbe (diff)
parentacef4ba0546091d28566a77eb31c1adb8587c835 (diff)
downloadbundler-de74bc30e7bb31228b4a25a4b02f69cee06ef76d.tar.gz
Merge branch 'master' of https://github.com/bundler/bundler
Diffstat (limited to 'lib/bundler')
-rw-r--r--lib/bundler/definition.rb2
-rw-r--r--lib/bundler/lockfile_parser.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index eb97b81a..4df61766 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -317,7 +317,7 @@ module Bundler
# Record the version of Bundler that was used to create the lockfile
out << "\nBUNDLED WITH\n"
- out << " #{lock_version}\n"
+ out << " #{lock_version}\n"
out
end
diff --git a/lib/bundler/lockfile_parser.rb b/lib/bundler/lockfile_parser.rb
index 21367fe7..c08aa763 100644
--- a/lib/bundler/lockfile_parser.rb
+++ b/lib/bundler/lockfile_parser.rb
@@ -179,7 +179,7 @@ module Bundler
end
def parse_bundled_with(line)
- line = line.strip
+ line = line[3..-1]
if Gem::Version.correct?(line)
@bundler_version = Gem::Version.create(line)
end