Do not count sizes of to be configured packages

Author: jgg
Date: 1999-04-16 21:46:13 GMT
Do not count sizes of to be configured packages

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 1529eb364370c53bcfc5fdce9bca3d973cb32585..7d1ff05ead192836d7766d40de867d87701385a7 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: depcache.cc,v 1.16 1999/04/12 04:21:20 jgg Exp $
+// $Id: depcache.cc,v 1.17 1999/04/16 21:46:13 jgg Exp $
 /* ######################################################################
 
    Dependency Cache - Caches Dependency information.
@@ -205,10 +205,7 @@ void pkgDepCache::AddSizes(const PkgIterator &Pkg,long Mult)
    
    if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure && 
        P.Keep() == true)
-   {
-      iUsrSize += Mult*P.InstVerIter(*this)->InstalledSize;
       return;
-   }
    
    // Compute the size data
    if (P.NewInstall() == true)

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 0564ce15e1ca76b8ca415045399164f83838e95a..14ed1dea599778a670b04a72ef6804ac0a258814 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -24,7 +24,7 @@ SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
 SOURCE+= pkgcache.cc version.cc fileutl.cc pkgcachegen.cc depcache.cc \
          orderlist.cc tagfile.cc sourcelist.cc packagemanager.cc \
         pkgrecords.cc algorithms.cc acquire.cc acquire-item.cc \
-        acquire-worker.cc acquire-method.cc init.cc clean.cc templates.cc \
+        acquire-worker.cc acquire-method.cc init.cc clean.cc \
         srcrecords.cc
 
 # Source code for the debian specific components

diff --git a/apt-pkg/templates.cc b/apt-pkg/templates.cc
deleted file mode 100644 (file)
index 1e7d202..0000000
--- a/apt-pkg/templates.cc
+++ /dev/null
@@ -1,5 +0,0 @@
-/* All template instances are explicly declared here */
-
-#include <apt-pkg/sourcelist.h>
-
-template vector<pkgSourceList::Item>;