Use the Gemfile's name as a base for Gemfile.lock

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 8112437260..f094986f68 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -141,7 +141,7 @@ module Bundler
       if opts[:production]
         Bundler.production = true
 
-        unless Bundler.root.join("Gemfile.lock").exist?
+        unless Bundler.default_lockfile.exist?
           raise ProductionError, "The --production flag requires a Gemfile.lock. Please\n" \
                                  "make sure you have checked your Gemfile.lock into version\n" \
                                  "control before deploying."
@@ -153,7 +153,7 @@ module Bundler
       end
 
       # Can't use Bundler.settings for this because settings needs gemfile.dirname
-      ENV['BUNDLE_GEMFILE'] = opts[:gemfile] if opts[:gemfile]
+      ENV['BUNDLE_GEMFILE'] = File.expand_path(opts[:gemfile]) if opts[:gemfile]
       Bundler.settings[:path] = nil if options[:system]
       Bundler.settings[:path] = "vendor/bundle" if options[:production]
       Bundler.settings[:path] = path if path