diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:51:50 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:51:50 +0000 |
| commit | 018f15333c0b24232f771a675fc2b4c8cb5fe799 (patch) | |
| tree | 39c876564f6963479d6ffe30e41427b3c32b5f3b /apt-pkg | |
| parent | 542ec555f1d484a299b56e35655756d78716f102 (diff) | |
CDROM and GlobOr fix
Author: jgg
Date: 1998-12-04 22:56:50 GMT
CDROM and GlobOr fix
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/acquire-method.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/acquire-method.h | 4 | ||||
| -rw-r--r-- | apt-pkg/pkgcache.cc | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 1cebf9a71..fc060d83e 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.11 1998/12/04 21:16:46 jgg Exp $ +// $Id: acquire-method.cc,v 1.12 1998/12/04 22:56:50 jgg Exp $ /* ###################################################################### Acquire Method @@ -189,7 +189,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) // --------------------------------------------------------------------- /* This sends a 403 Media Failure message to the APT and waits for it to be ackd */ -void pkgAcqMethod::MediaFail(string Required,string Drive) +bool pkgAcqMethod::MediaFail(string Required,string Drive) { char S[1024]; snprintf(S,sizeof(S),"403 Media Failure\nMedia: %s\nDrive: %s\n\n", diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index 08c88265c..69ed28585 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-method.h,v 1.5 1998/12/03 07:29:17 jgg Exp $ +// $Id: acquire-method.h,v 1.6 1998/12/04 22:56:51 jgg Exp $ /* ###################################################################### Acquire Method - Method helper class + functions @@ -58,7 +58,7 @@ class pkgAcqMethod void Fail(string Why, bool Transient = false); void URIStart(FetchResult &Res); void URIDone(FetchResult &Res,FetchResult *Alt = 0); - void MediaFail(string Required,string Drive); + bool MediaFail(string Required,string Drive); public: diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 06cad4b16..8b0e85ea3 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgcache.cc,v 1.18 1998/11/27 00:07:24 jgg Exp $ +// $Id: pkgcache.cc,v 1.19 1998/12/04 22:56:52 jgg Exp $ /* ###################################################################### Package Cache - Accessor code for the cache @@ -379,9 +379,10 @@ void pkgCache::DepIterator::GlobOr(DepIterator &Start,DepIterator &End) // Compute a single dependency element (glob or) Start = *this; End = *this; - for (bool LastOR = true; end() == false && LastOR == true; (*this)++) + for (bool LastOR = true; end() == false && LastOR == true;) { LastOR = (Dep->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or; + (*this)++; if (LastOR == true) End = (*this); } |