diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:52:47 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:52:47 +0000 |
| commit | 65a1e968442361247b646dc61843f841235114e0 (patch) | |
| tree | 733c37e21376beceac7537511cf78d7160ac2892 /apt-pkg | |
| parent | be5dbaf215aa054bdc8a5cab67e5ce429215b7aa (diff) | |
Minor fixes
Author: jgg
Date: 1999-02-08 07:30:49 GMT
Minor fixes
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/acquire-method.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/pkgcachegen.cc | 5 |
4 files changed, 10 insertions, 5 deletions
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 7f0119819..9bb76e53c 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-method.cc,v 1.16 1999/01/27 02:48:52 jgg Exp $ +// $Id: acquire-method.cc,v 1.17 1999/02/08 07:30:49 jgg Exp $ /* ###################################################################### Acquire Method @@ -18,6 +18,7 @@ #include <apt-pkg/fileutl.h> #include <stdio.h> +#include <unistd.h> /*}}}*/ // AcqMethod::pkgAcqMethod - Constructor /*{{{*/ diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 6baafcfcf..f34d839e3 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: fileutl.cc,v 1.18 1999/02/03 23:13:37 jgg Exp $ +// $Id: fileutl.cc,v 1.19 1999/02/08 07:30:50 jgg Exp $ /* ###################################################################### File Utilities @@ -24,6 +24,7 @@ #include <sys/stat.h> #include <sys/fcntl.h> #include <sys/types.h> +#include <errno.h> /*}}}*/ // CopyFile - Buffered copy of a file /*{{{*/ diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index d6f25bd01..82d4f3ee9 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: deblistparser.cc,v 1.15 1999/02/01 02:22:11 jgg Exp $ +// $Id: deblistparser.cc,v 1.16 1999/02/08 07:30:50 jgg Exp $ /* ###################################################################### Package Cache Generator - Generator for the cache structure. @@ -44,7 +44,7 @@ string debListParser::Package() { string Result = Section.FindS("Package"); if (Result.empty() == true) - _error->Error("Encoutered a section with no Package: header"); + _error->Error("Encountered a section with no Package: header"); return Result; } /*}}}*/ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 89bcec801..959075c0f 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.27 1999/01/27 02:48:52 jgg Exp $ +// $Id: pkgcachegen.cc,v 1.28 1999/02/08 07:30:49 jgg Exp $ /* ###################################################################### Package Cache Generator - Generator for the cache structure. @@ -74,6 +74,9 @@ bool pkgCacheGenerator::MergeList(ListParser &List) { // Get a pointer to the package structure string PackageName = List.Package(); + if (PackageName.empty() == true) + return false; + pkgCache::PkgIterator Pkg; if (NewPackage(Pkg,PackageName) == false) return _error->Error("Error occured while processing %s (NewPackage)",PackageName.c_str()); |