* cmdline/apt-get.cc:

  - do not discard the error messages from the resolver and instead
    only show the general 'Broken packages' message if nothing else

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index d48ca18f91ade07b7217a8998cdd752a35d02c00..65eaef0d84d298bb492f80ac2dbebb0cfb71704b 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1886,8 +1886,7 @@ bool DoInstall(CommandLine &CmdL)
       {
         // Call the scored problem resolver
         Fix->InstallProtect();
       {
         // Call the scored problem resolver
         Fix->InstallProtect();

-        if (Fix->Resolve(true) == false)
-           ; //FIXME: is there a valid reason for?  _error->Discard();
+        Fix->Resolve(true);

         delete Fix;
       }
 
         delete Fix;
       }
 


@@ -1913,8 +1912,11 @@ bool DoInstall(CommandLine &CmdL)
         c1out << _("The following information may help to resolve the situation:") << endl;
         c1out << endl;
         ShowBroken(c1out,Cache,false);
         c1out << _("The following information may help to resolve the situation:") << endl;
         c1out << endl;
         ShowBroken(c1out,Cache,false);

-        return _error->Error(_("Broken packages"));
-      }   
+        if (_error->PendingError() == true)
+           return false;
+        else
+           return _error->Error(_("Broken packages"));
+      }

    }
    if (!DoAutomaticRemove(Cache)) 
       return false;
    }
    if (!DoAutomaticRemove(Cache)) 
       return false;

diff --git a/debian/changelog b/debian/changelog
index 9fc6dc19363532c44d73ba72a10828373cbf0a86..71f64dc2347dcbf5f2f78b54082616605245a1c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,12 +16,15 @@ apt (0.8.15) UNRELEASED; urgency=low
     - let the Mark methods return if their marking was successful
     - if a Breaks can't be upgraded, remove it. If it or a Conflict
       can't be removed the installation of the breaker fails.
     - let the Mark methods return if their marking was successful
     - if a Breaks can't be upgraded, remove it. If it or a Conflict
       can't be removed the installation of the breaker fails.

+  * cmdline/apt-get.cc:
+    - do not discard the error messages from the resolver and instead
+      only show the general 'Broken packages' message if nothing else

 
   [ Stefano Zacchiroli ]
   * doc/external-dependency-solver-protocol.txt:
     - describe EDSP and the configuration interface around it
 
 
   [ Stefano Zacchiroli ]
   * doc/external-dependency-solver-protocol.txt:
     - describe EDSP and the configuration interface around it
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 17 May 2011 17:59:24 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 17 May 2011 18:43:21 +0200

 
 apt (0.8.14.2) UNRELEASED; urgency=low
 
 
 apt (0.8.14.2) UNRELEASED; urgency=low
 

diff --git a/test/integration/test-handling-broken-orgroups b/test/integration/test-handling-broken-orgroups
index d88ad0000a58f32c5fbcafb13d6b44c69219644e..20b314074b19209a28c57fac111374d1923cf38f 100755 (executable)
--- a/test/integration/test-handling-broken-orgroups
+++ b/test/integration/test-handling-broken-orgroups
@@ -58,7 +58,7 @@ The following information may help to resolve the situation:
 The following packages have unmet dependencies:
  coolstuff-broken : Depends: cool2 but it is not installable or
                              stuff2 but it is not installable
 The following packages have unmet dependencies:
  coolstuff-broken : Depends: cool2 but it is not installable or
                              stuff2 but it is not installable

-E: Broken packages' aptget install coolstuff-broken -s
+E: Unable to correct problems, you have held broken packages.' aptget install coolstuff-broken -s

 
 testequal 'Reading package lists...
 Building dependency tree...
 
 testequal 'Reading package lists...
 Building dependency tree...


@@ -105,4 +105,4 @@ The following information may help to resolve the situation:
 The following packages have unmet dependencies:
  coolstuff-provided-broken : Depends: cool2 but it is not installable or
                                       stuff-abi-2
 The following packages have unmet dependencies:
  coolstuff-provided-broken : Depends: cool2 but it is not installable or
                                       stuff-abi-2

-E: Broken packages' aptget install coolstuff-provided-broken -s
+E: Unable to correct problems, you have held broken packages.' aptget install coolstuff-provided-broken -s

diff --git a/test/integration/test-release-candidate-switching b/test/integration/test-release-candidate-switching
index b6dbe99db4b6193013755ecc33eebd2ec54680f5..0970cb93546f215e2c41ca8c037556a4e2a233c0 100755 (executable)
--- a/test/integration/test-release-candidate-switching
+++ b/test/integration/test-release-candidate-switching
@@ -416,4 +416,4 @@ The following information may help to resolve the situation:
 The following packages have unmet dependencies:
  uninstallablepkg : Depends: libmtp8 (>= 10:0.20.1) but it is not going to be installed
                     Depends: amarok-utils (= 2.3.2-2+exp) but 2.3.1-1+sid is to be installed
 The following packages have unmet dependencies:
  uninstallablepkg : Depends: libmtp8 (>= 10:0.20.1) but it is not going to be installed
                     Depends: amarok-utils (= 2.3.2-2+exp) but 2.3.1-1+sid is to be installed

-E: Broken packages" aptget install uninstallablepkg/experimental --trivial-only -V -q=0
+E: Unable to correct problems, you have held broken packages." aptget install uninstallablepkg/experimental --trivial-only -V -q=0