Browse Source

Remove fix
Author: jgg
Date: 1999-11-26 00:05:55 GMT
Remove fix

Arch Librarian 22 years ago
parent
commit
a146c9273a
2 changed files with 7 additions and 3 deletions
  1. 5 2
      cmdline/apt-get.cc
  2. 2 1
      debian/changelog

+ 5 - 2
cmdline/apt-get.cc

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: apt-get.cc,v 1.89 1999/11/17 01:52:01 jgg Exp $
+// $Id: apt-get.cc,v 1.90 1999/11/26 00:05:55 jgg Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -794,7 +794,10 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
    
    // Check if there is something at all to install
    pkgDepCache::StateCache &State = Cache[Pkg];
-   if (State.CandidateVer == 0)
+   if (Remove == true && Pkg->CurrentVer == 0)
+      return _error->Error("Package %s is not installed",Pkg.Name());
+   
+   if (State.CandidateVer == 0 && Remove == false)
    {
       if (AllowFail == false)
 	 return false;

+ 2 - 1
debian/changelog

@@ -5,7 +5,8 @@ apt (0.3.14.1) unstable; urgency=low
   * Fixed buffer overflow for wide terminal sizes. Closes: #50295
   * Made -s and clean not do anything. Closes: #50238
   * Problem with Protected packages and the new OR code.
-  * /usr/share/doc stuff. Closes: #51017, #50228
+  * /usr/share/doc stuff. Closes: #51017, #50228, #51141
+  * Remove doesn't require a package to be installable. Closes: #51175
   
   -- Ben Gertzfield <che@debian.org>  Sun,  7 Nov 1999 20:21:25 -0800