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

Fixed small virtual package install list glitch
Author: jgg
Date: 1999-02-07 08:40:34 GMT
Fixed small virtual package install list glitch

Arch Librarian лет назад: 22
Родитель
Сommit
be5dbaf215
1 измененных файлов с 8 добавлено и 6 удалено
  1. 8 6
      cmdline/apt-get.cc

+ 8 - 6
cmdline/apt-get.cc

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
 // Description								/*{{{*/
-// $Id: apt-get.cc,v 1.38 1999/02/01 08:11:57 jgg Exp $
+// $Id: apt-get.cc,v 1.39 1999/02/07 08:40:34 jgg Exp $
 /* ######################################################################
 /* ######################################################################
    
    
    apt-get - Cover for dpkg
    apt-get - Cover for dpkg
@@ -773,11 +773,13 @@ bool DoInstall(CommandLine &CmdL)
 	       pkgCache::PkgIterator Pkg = I.OwnerPkg();
 	       pkgCache::PkgIterator Pkg = I.OwnerPkg();
 	       
 	       
 	       if ((*Cache)[Pkg].CandidateVerIter(*Cache) == I.OwnerVer())
 	       if ((*Cache)[Pkg].CandidateVerIter(*Cache) == I.OwnerVer())
-		  c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() << endl;
-
-	       if ((*Cache)[Pkg].InstVerIter(*Cache) == I.OwnerVer())
-		  c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() <<
-		    " [Installed]"<< endl;
+	       {
+		  if ((*Cache)[Pkg].Install() == true && (*Cache)[Pkg].NewInstall() == false)
+		     c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() <<
+		     " [Installed]"<< endl;
+		  else
+		     c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() << endl;
+	       }      
 	    }
 	    }
 	    c1out << "You should explicly select one to install." << endl;
 	    c1out << "You should explicly select one to install." << endl;
 	 }
 	 }