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

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

Arch Librarian лет назад: 22
Родитель
Сommit
3164dff98e
6 измененных файлов с 20 добавлено и 3 удалено
  1. 1 0
      apt-pkg/makefile
  2. 15 2
      apt-pkg/pkgrecords.cc
  3. 1 1
      buildlib/defaults.mak
  4. 1 0
      buildlib/makefile.in
  5. 1 0
      cmdline/makefile
  6. 1 0
      doc/makefile

+ 1 - 0
apt-pkg/makefile

@@ -1,5 +1,6 @@
 # -*- make -*-
 BASE=..
+SUBDIR=apt-pkg
 
 # Header location
 SUBDIRS = deb contrib

+ 15 - 2
apt-pkg/pkgrecords.cc

@@ -1,6 +1,6 @@
 // -*- 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
@@ -15,6 +15,7 @@
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
 									/*}}}*/
 
 // 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)
 {
+   string ListDir = _config->FindDir("Dir::State::lists");
+   
    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;
+      
+      // Create the parser
       Files[I->ID].Parse = new debRecordParser(*Files[I->ID].File);
       if (_error->PendingError() == true)
 	 return;

+ 1 - 1
buildlib/defaults.mak

@@ -47,7 +47,7 @@ endif
 INCLUDE := $(BUILD)/include
 BIN := $(BUILD)/bin
 LIB := $(BIN)
-OBJ := $(BUILD)/obj
+OBJ := $(BUILD)/obj/$(SUBDIR)
 DEP := $(OBJ)
 DOC := $(BUILD)/doc
 

+ 1 - 0
buildlib/makefile.in

@@ -6,6 +6,7 @@
 
 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
 

+ 1 - 0
cmdline/makefile

@@ -1,5 +1,6 @@
 # -*- make -*-
 BASE=..
+SUBDIR=cmdline
 
 # Bring in the default rules
 include ../buildlib/defaults.mak

+ 1 - 0
doc/makefile

@@ -1,5 +1,6 @@
 # -*- make -*-
 BASE=..
+SUBDIR=doc
 
 # Bring in the default rules
 include ../buildlib/defaults.mak