The CLI should print a better warning on bundle check if the resolver can't get all the way through

2 files changed, 19 insertions, 1 deletions

diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index e092f30887..8112437260 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -59,7 +59,13 @@ module Bundler
       If not, the first missing gem is listed and Bundler exits status 1.
     D
     def check
-      not_installed = Bundler.definition.missing_specs
+      begin
+        not_installed = Bundler.definition.missing_specs
+      rescue GemNotFound, VersionConflict
+        Bundler.ui.error "Your Gemfile's dependencies could not be satisfied"
+        Bundler.ui.warn  "Install missing gems with `bundle install`"
+        exit 1
+      end
 
       if not_installed.any?
         Bundler.ui.error "The following gems are missing"
diff --git a/spec/other/check_spec.rb b/spec/other/check_spec.rb
index 188351a35a..aaedbc26be 100644
--- a/spec/other/check_spec.rb
+++ b/spec/other/check_spec.rb
@@ -25,6 +25,18 @@ describe "bundle check" do
     bundled_app("Gemfile.lock").should exist
   end
 
+  it "prints a generic error if the missing gems are unresolvable" do
+    system_gems ["rails-2.3.2"]
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "rails"
+    G
+
+    bundle :check
+    out.should include("Your Gemfile's dependencies could not be satisfied")
+  end
+
   it "shows what is missing with the current Gemfile if it is not satisfied" do
     gemfile <<-G
       source "file://#{gem_repo1}"