Progress meter

Author: jgg
Date: 1998-08-19 06:16:08 GMT
Progress meter

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index f06e1afd2a656ce2ae9f9e4c52fc895a70caf1df..1c28711fe0e9bcb4aedd278e3770daac4f35893e 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -1,5 +1,6 @@
 # -*- make -*-
 BASE=..
 # -*- make -*-
 BASE=..

+SUBDIR=apt-pkg

 
 # Header location
 SUBDIRS = deb contrib
 
 # Header location
 SUBDIRS = deb contrib

diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index b3105da4444f2eaa7b364d49d178a271a123fd8b..bb8b05759836489e553a79742f542bace3e3f277 100644 (file)
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgrecords.cc,v 1.1 1998/08/09 00:51:35 jgg Exp $
+// $Id: pkgrecords.cc,v 1.2 1998/08/19 06:16:10 jgg Exp $

 /* ######################################################################
    
    Package Records - Allows access to complete package description records
 /* ######################################################################
    
    Package Records - Allows access to complete package description records


@@ -15,6 +15,7 @@
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/error.h>

+#include <apt-pkg/configuration.h>

                                                                        /*}}}*/
 
 // Records::pkgRecords - Constructor                                   /*{{{*/
                                                                        /*}}}*/
 
 // Records::pkgRecords - Constructor                                   /*{{{*/


@@ -22,13 +23,25 @@
 /* This will create the necessary structures to access the status files */
 pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
 {
 /* This will create the necessary structures to access the status files */
 pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
 {

+   string ListDir = _config->FindDir("Dir::State::lists");
+   

    Files = new PkgFile[Cache.HeaderP->PackageFileCount];   
    for (pkgCache::PkgFileIterator I = Cache.FileBegin(); 
        I.end() == false; I++)
    {
    Files = new PkgFile[Cache.HeaderP->PackageFileCount];   
    for (pkgCache::PkgFileIterator I = Cache.FileBegin(); 
        I.end() == false; I++)
    {

-      Files[I->ID].File = new FileFd(I.FileName(),FileFd::ReadOnly);
+      // We can not initialize if the cache is out of sync.
+      if (I.IsOk() == false)
+      {
+        _error->Error("Package file %s is out of sync.",I.FileName());
+        return;
+      }
+   
+      // Create the file
+      Files[I->ID].File = new FileFd(ListDir + I.FileName(),FileFd::ReadOnly);

       if (_error->PendingError() == true)
         return;
       if (_error->PendingError() == true)
         return;

+      
+      // Create the parser

       Files[I->ID].Parse = new debRecordParser(*Files[I->ID].File);
       if (_error->PendingError() == true)
         return;
       Files[I->ID].Parse = new debRecordParser(*Files[I->ID].File);
       if (_error->PendingError() == true)
         return;

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index e5a63fc1b5f1f718e6caddc1b00da3dc29722bfc..e9e7546fe9ee1aedfdb2bc4fc3d586fcbfa8057e 100644 (file)
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -47,7 +47,7 @@ endif
 INCLUDE := $(BUILD)/include
 BIN := $(BUILD)/bin
 LIB := $(BIN)
 INCLUDE := $(BUILD)/include
 BIN := $(BUILD)/bin
 LIB := $(BIN)

-OBJ := $(BUILD)/obj
+OBJ := $(BUILD)/obj/$(SUBDIR)

 DEP := $(OBJ)
 DOC := $(BUILD)/doc
 
 DEP := $(OBJ)
 DOC := $(BUILD)/doc
 

diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index 093ac204cf904f78e20eb06e6f6752fb994933eb..f53b8cca9a53f46ae7a9ae01417733c66bcacb16 100644 (file)
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -6,6 +6,7 @@
 
 SRCDIR=@top_srcdir@
 SUBDIRS:=./doc ./bin ./obj ./include/apt-pkg ./include/deity
 
 SRCDIR=@top_srcdir@
 SUBDIRS:=./doc ./bin ./obj ./include/apt-pkg ./include/deity

+SUBDIRS+=./obj/doc ./obj/apt-pkg ./obj/deity ./obj/gui ./obj/cmdline

 BUILD:=$(shell pwd)
 export BUILD
 
 BUILD:=$(shell pwd)
 export BUILD
 

diff --git a/cmdline/makefile b/cmdline/makefile
index d521c58db2ac1954de3e54b6227261330a978753..2dd10d6bc63f2bc3f0d9f579c8ae01d217fe1b8c 100644 (file)
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -1,5 +1,6 @@
 # -*- make -*-
 BASE=..
 # -*- make -*-
 BASE=..

+SUBDIR=cmdline

 
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
 # Bring in the default rules
 include ../buildlib/defaults.mak

diff --git a/doc/makefile b/doc/makefile
index b53f4a0b306ee538bf5893396b9b69bae3481270..e6a2dbefe250403e23fa30f007ca0d054c243f2b 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -1,5 +1,6 @@
 # -*- make -*-
 BASE=..
 # -*- make -*-
 BASE=..

+SUBDIR=doc

 
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
 # Bring in the default rules
 include ../buildlib/defaults.mak