summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:51:24 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:51:24 +0000
commit0919e3f9400aba51bd73e7f90c6d1ba4406b5421 (patch)
tree8f8238229c598b7384c22f0c6eb100e7653ad479 /apt-pkg
parent93274b8d888dea1cf8a855029800b808c6244605 (diff)
apt-get update works
Author: jgg Date: 1998-11-11 23:45:08 GMT apt-get update works
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire.cc4
-rw-r--r--apt-pkg/pkgcachegen.cc7
2 files changed, 5 insertions, 6 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 8493691ca..3e22268a7 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire.cc,v 1.12 1998/11/11 07:30:55 jgg Exp $
+// $Id: acquire.cc,v 1.13 1998/11/11 23:45:08 jgg Exp $
/* ######################################################################
Acquire - File Acquiration
@@ -322,7 +322,7 @@ bool pkgAcquire::Run()
for (Queue *I = Queues; I != 0; I = I->Next)
I->Shutdown();
- return _error->PendingError();
+ return !_error->PendingError();
}
/*}}}*/
// Acquire::Bump - Called when an item is dequeued /*{{{*/
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index f41ee4925..25704e053 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: pkgcachegen.cc,v 1.20 1998/10/20 02:39:21 jgg Exp $
+// $Id: pkgcachegen.cc,v 1.21 1998/11/11 23:45:28 jgg Exp $
/* ######################################################################
Package Cache Generator - Generator for the cache structure.
@@ -385,7 +385,7 @@ bool pkgSrcCacheCheck(pkgSourceList &List)
return false;
string CacheFile = _config->FindFile("Dir::Cache::srcpkgcache");
- string ListDir = _config->FindFile("Dir::State::lists");
+ string ListDir = _config->FindDir("Dir::State::lists");
// Count the number of missing files
int Missing = 0;
@@ -592,8 +592,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress)
if (SrcOk == false)
{
string SCacheFile = _config->FindFile("Dir::Cache::srcpkgcache");
- string ListDir = _config->FindFile("Dir::State::lists");
-
+ string ListDir = _config->FindDir("Dir::State::lists");
FileFd SCacheF(SCacheFile,FileFd::WriteEmpty);
FileFd CacheF(CacheFile,FileFd::WriteEmpty);
DynamicMMap Map(CacheF,MMap::Public);