From c5ccf1750dd00e8c4374162b302a0946f7fe3a96 Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Mon, 20 Sep 2004 16:55:44 +0000 Subject: Bug fixes, new major version Author: jgg Date: 2000-01-27 04:15:09 GMT Bug fixes, new major version --- apt-pkg/acquire-item.h | 5 +++-- apt-pkg/acquire-worker.cc | 17 +++++++++++++++-- apt-pkg/acquire.cc | 4 ++-- apt-pkg/acquire.h | 5 +++-- debian/changelog | 10 ++++++++-- dselect/install | 6 ++++++ dselect/setup | 2 +- methods/file.cc | 6 +++--- 8 files changed, 41 insertions(+), 14 deletions(-) diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 459d7d26d..bf1a50e75 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-item.h,v 1.23 2000/01/17 07:11:49 jgg Exp $ +// $Id: acquire-item.h,v 1.24 2000/01/27 04:15:09 jgg Exp $ /* ###################################################################### Acquire Item - Item to acquire @@ -71,7 +71,8 @@ class pkgAcquire::Item // Inquire functions virtual string MD5Sum() {return string();}; - + pkgAcquire *GetOwner() {return Owner;}; + Item(pkgAcquire *Owner); virtual ~Item(); }; diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 40092d5d6..97a7fbb77 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-worker.cc,v 1.29 2000/01/17 07:11:49 jgg Exp $ +// $Id: acquire-worker.cc,v 1.30 2000/01/27 04:15:09 jgg Exp $ /* ###################################################################### Acquire Worker @@ -233,6 +233,10 @@ bool pkgAcquire::Worker::RunMessages() ResumePoint = atoi(LookupTag(Message,"Resume-Point","0").c_str()); Itm->Owner->Start(Message,atoi(LookupTag(Message,"Size","0").c_str())); + // Display update before completion + if (Log != 0 && Log->MorePulses == true) + Log->Pulse(Itm->Owner->GetOwner()); + if (Log != 0) Log->Fetch(*Itm); @@ -247,9 +251,14 @@ bool pkgAcquire::Worker::RunMessages() _error->Error("Method gave invalid 201 URI Done message"); break; } - + pkgAcquire::Item *Owner = Itm->Owner; pkgAcquire::ItemDesc Desc = *Itm; + + // Display update before completion + if (Log != 0 && Log->MorePulses == true) + Log->Pulse(Owner->GetOwner()); + OwnerQ->ItemDone(Itm); if (TotalSize != 0 && (unsigned)atoi(LookupTag(Message,"Size","0").c_str()) != TotalSize) @@ -286,6 +295,10 @@ bool pkgAcquire::Worker::RunMessages() break; } + // Display update before completion + if (Log != 0 && Log->MorePulses == true) + Log->Pulse(Itm->Owner->GetOwner()); + pkgAcquire::Item *Owner = Itm->Owner; pkgAcquire::ItemDesc Desc = *Itm; OwnerQ->ItemDone(Itm); diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index da3160cae..428bfd50f 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.45 2000/01/17 07:11:49 jgg Exp $ +// $Id: acquire.cc,v 1.46 2000/01/27 04:15:09 jgg Exp $ /* ###################################################################### Acquire - File Acquiration @@ -706,7 +706,7 @@ void pkgAcquire::Queue::Bump() // AcquireStatus::pkgAcquireStatus - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgAcquireStatus::pkgAcquireStatus() +pkgAcquireStatus::pkgAcquireStatus() : Update(true), MorePulses(false) { Start(); } diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 5565ad3ac..de1474f56 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire.h,v 1.26 2000/01/17 07:11:49 jgg Exp $ +// $Id: acquire.h,v 1.27 2000/01/27 04:15:09 jgg Exp $ /* ###################################################################### Acquire - File Acquiration @@ -253,7 +253,8 @@ class pkgAcquireStatus public: bool Update; - + bool MorePulses; + // Called by items when they have finished a real download virtual void Fetched(unsigned long Size,unsigned long ResumePoint); diff --git a/debian/changelog b/debian/changelog index 8d1f98f10..8a526e036 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,14 @@ apt (0.3.16.1) unstable; urgency=low * Included the configure-index example * Minimal CD swaps * Library soname has increased - * Fixed default sources.list to have correct URLs for potato when it becomes - stable + * Fixed default sources.list to have correct URLs for potato when it + becomes stable + * Added a message about erasing sources.list to dselect setup script + Closes: #55755 + * No remove prompt if the archives dir has not changed. Closes: #55709 + * Fixed inclusion of 2nd sample config file. Closes: #55374 + * Made file mtimes of 0 not confuse the methods If-Modifed-Since check. + Closes: #55991 -- Ben Gertzfield Fri, 14 Jan 2000 08:04:15 -0800 diff --git a/dselect/install b/dselect/install index 93a0f1e44..3fbab73cf 100755 --- a/dselect/install +++ b/dselect/install @@ -39,6 +39,7 @@ yesno() { echo $ans | tr YN yn } +OLDLS=`ls -ld $ARCHIVES` if [ x$WAIT = "xyes" ]; then $APTGET $OPTS -d dselect-upgrade echo "Press enter to continue." && read RES @@ -61,6 +62,11 @@ if [ $RES -eq 0 ]; then -eq 0 ]; then exit 0 fi + + NEWLS=`ls -ld $ARCHIVES` + if [ "x$OLDLS" == "x$NEWLS" ]; then + exit 0 + fi # Check the cleaning mode case `echo $CLEAN | tr '[:upper:]' '[:lower:]'` in diff --git a/dselect/setup b/dselect/setup index 86055d0a1..8386d9000 100755 --- a/dselect/setup +++ b/dselect/setup @@ -269,7 +269,7 @@ sub main { print "-" x 72, "\n"; &print_config('Config' => \@Oldconfig); print "-" x 72, "\n"; - print "$boldon Do you wish to change it?[y/N]$boldoff "; + print "$boldon Do you wish to change (overwrite) it?[y/N]$boldoff "; my $answer = ; chomp ($answer); $answer =~ s/\s+/ /og; diff --git a/methods/file.cc b/methods/file.cc index f2bcf371a..298f06608 100644 --- a/methods/file.cc +++ b/methods/file.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: file.cc,v 1.7 1999/01/18 06:20:08 jgg Exp $ +// $Id: file.cc,v 1.8 2000/01/27 04:15:10 jgg Exp $ /* ###################################################################### File URI method for APT @@ -48,7 +48,7 @@ bool FileMethod::Fetch(FetchItem *Itm) Res.Filename = File; Res.LastModified = Buf.st_mtime; Res.IMSHit = false; - if (Itm->LastModified == Buf.st_mtime) + if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0) Res.IMSHit = true; } @@ -64,7 +64,7 @@ bool FileMethod::Fetch(FetchItem *Itm) AltRes.Filename = File; AltRes.LastModified = Buf.st_mtime; AltRes.IMSHit = false; - if (Itm->LastModified == Buf.st_mtime) + if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0) AltRes.IMSHit = true; URIDone(Res,&AltRes); -- cgit v1.2.3