Просмотр исходного кода

* Don't suggest apt-get -f install to correct broken bu...
Author: mdz
Date: 2003-12-24 22:53:10 GMT
* Don't suggest apt-get -f install to correct broken build-deps; broken
installed packages are rarely the cause (Closes: #220858)

Arch Librarian лет назад: 22
Родитель
Сommit
c33d7c4d6b
2 измененных файлов с 5 добавлено и 4 удалено
  1. 2 3
      cmdline/apt-get.cc
  2. 3 1
      debian/changelog

+ 2 - 3
cmdline/apt-get.cc

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: apt-get.cc,v 1.149 2003/12/20 23:58:55 mdz Exp $
+// $Id: apt-get.cc,v 1.150 2003/12/24 22:53:10 mdz Exp $
 /* ######################################################################
 /* ######################################################################
    
    
    apt-get - Cover for dpkg
    apt-get - Cover for dpkg
@@ -2222,8 +2222,7 @@ bool DoBuildDep(CommandLine &CmdL)
       
       
       // Now we check the state of the packages,
       // Now we check the state of the packages,
       if (Cache->BrokenCount() != 0)
       if (Cache->BrokenCount() != 0)
-	 return _error->Error(_("Some broken packages were found while trying to process build-dependencies for %s.\n"
-				"You might want to run `apt-get -f install' to correct these."),*I);
+         return _error->Error(_("Build-dependencies for %s could not be satisfied."),*I);
    }
    }
   
   
    if (InstallPackages(Cache, false, true) == false)
    if (InstallPackages(Cache, false, true) == false)

+ 3 - 1
debian/changelog

@@ -4,8 +4,10 @@ apt (0.5.16) unstable; urgency=low
     (Closes: #222560)
     (Closes: #222560)
   * Update config.guess and config.sub from autotools-dev 20031007.1
   * Update config.guess and config.sub from autotools-dev 20031007.1
   * Add knetbsd to buildlib/ostable (Closes: #212344)
   * Add knetbsd to buildlib/ostable (Closes: #212344)
+  * Don't suggest apt-get -f install to correct broken build-deps; broken
+    installed packages are rarely the cause (Closes: #220858)
 
 
- -- Matt Zimmerman <mdz@debian.org>  Wed, 24 Dec 2003 14:48:28 -0800
+ --
 
 
 apt (0.5.15) unstable; urgency=low
 apt (0.5.15) unstable; urgency=low