From 542ec555f1d484a299b56e35655756d78716f102 Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Mon, 20 Sep 2004 16:51:50 +0000 Subject: [PATCH] CDROM support Author: jgg Date: 1998-12-04 21:16:46 GMT CDROM support --- apt-pkg/acquire-method.cc | 6 +++--- apt-pkg/acquire-worker.cc | 37 ++++++++++++++++++++++++++++++++++--- apt-pkg/acquire-worker.h | 5 +++-- apt-pkg/acquire.h | 7 +++++-- apt-pkg/contrib/strutl.cc | 4 ++-- cmdline/acqprogress.cc | 19 ++++++++++++++++++- cmdline/acqprogress.h | 3 ++- doc/method.sgml | 11 ++++++----- 8 files changed, 73 insertions(+), 19 deletions(-) diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 7c3fdecb..1cebf9a7 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.10 1998/12/03 07:29:16 jgg Exp $ +// $Id: acquire-method.cc,v 1.11 1998/12/04 21:16:46 jgg Exp $ /* ###################################################################### Acquire Method @@ -230,8 +230,8 @@ void pkgAcqMethod::MediaFail(string Required,string Drive) Messages.push_back(MyMessages.front()); MyMessages.erase(MyMessages.begin()); } - - return; + + return StringToBool(LookupTag(Message,"Fail"),false); } Messages.push_back(Message); diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 3e76b3d9..67bb6120 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.13 1998/11/29 01:24:18 jgg Exp $ +// $Id: acquire-worker.cc,v 1.14 1998/12/04 21:16:47 jgg Exp $ /* ###################################################################### Acquire Worker @@ -26,6 +26,7 @@ #include #include #include +#include /*}}}*/ // Worker::Worker - Constructor for Queue startup /*{{{*/ @@ -288,6 +289,11 @@ bool pkgAcquire::Worker::RunMessages() case 401: _error->Error("Method %s General failure: %s",LookupTag(Message,"Message").c_str()); break; + + // 403 Media Change + case 403: + MediaChange(Message); + break; } } return true; @@ -318,6 +324,32 @@ bool pkgAcquire::Worker::Capabilities(string Message) Config->SendConfig << endl; } + return true; +} + /*}}}*/ +// Worker::MediaChange - Request a media change /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgAcquire::Worker::MediaChange(string Message) +{ + if (Log == 0 || Log->MediaChange(LookupTag(Message,"Media"), + LookupTag(Message,"Drive")) == false) + { + char S[300]; + sprintf(S,"603 Media Changed\nFailed: true\n\n"); + if (Debug == true) + clog << " -> " << Access << ':' << QuoteString(S,"\n") << endl; + OutQueue += S; + OutReady = true; + return true; + } + + char S[300]; + sprintf(S,"603 Media Changed\n\n"); + if (Debug == true) + clog << " -> " << Access << ':' << QuoteString(S,"\n") << endl; + OutQueue += S; + OutReady = true; return true; } /*}}}*/ @@ -451,8 +483,7 @@ void pkgAcquire::Worker::Pulse() { if (CurrentItem == 0) return; - - + struct stat Buf; if (stat(CurrentItem->Owner->DestFile.c_str(),&Buf) != 0) return; diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h index 95ba340a..29bdcc29 100644 --- a/apt-pkg/acquire-worker.h +++ b/apt-pkg/acquire-worker.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-worker.h,v 1.7 1998/11/09 01:09:24 jgg Exp $ +// $Id: acquire-worker.h,v 1.8 1998/12/04 21:16:48 jgg Exp $ /* ###################################################################### Acquire Worker - Worker process manager @@ -61,7 +61,8 @@ class pkgAcquire::Worker // The message handlers bool Capabilities(string Message); bool SendConfiguration(); - + bool MediaChange(string Message); + bool MethodFailure(); void ItemDone(); diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 1526a1f7..dc3896d3 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.15 1998/11/29 01:24:20 jgg Exp $ +// $Id: acquire.h,v 1.16 1998/12/04 21:16:49 jgg Exp $ /* ###################################################################### Acquire - File Acquiration @@ -208,11 +208,14 @@ class pkgAcquireStatus // Called by items when they have finished a real download virtual void Fetched(unsigned long Size,unsigned long ResumePoint); + // Called to change media + virtual bool MediaChange(string Media,string Drive) = 0; + // Each of these is called by the workers when an event occures virtual void IMSHit(pkgAcquire::ItemDesc &Itm) {}; virtual void Fetch(pkgAcquire::ItemDesc &Itm) {}; virtual void Done(pkgAcquire::ItemDesc &Itm) {}; - virtual void Fail(pkgAcquire::ItemDesc &Itm) {}; + virtual void Fail(pkgAcquire::ItemDesc &Itm) {}; virtual void Pulse(pkgAcquire *Owner); virtual void Start(); virtual void Stop(); diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 273118e9..499b72a5 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: strutl.cc,v 1.14 1998/12/03 07:29:18 jgg Exp $ +// $Id: strutl.cc,v 1.15 1998/12/04 21:16:50 jgg Exp $ /* ###################################################################### String Util - Some usefull string functions. @@ -640,7 +640,7 @@ void URI::CopyFrom(string U) Path = "/"; // Now we attempt to locate a user:pass@host fragment - if (U[1] == '/' && U[2] == '/') + if (FirstColon[1] == '/' && FirstColon[2] == '/') FirstColon += 3; else FirstColon += 1; diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc index c80d4a67..01f6f794 100644 --- a/cmdline/acqprogress.cc +++ b/cmdline/acqprogress.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acqprogress.cc,v 1.4 1998/11/28 20:56:08 jgg Exp $ +// $Id: acqprogress.cc,v 1.5 1998/12/04 21:16:52 jgg Exp $ /* ###################################################################### Acquire Progress - Command line progress meter @@ -228,3 +228,20 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner) Update = false; } /*}}}*/ +// AcqTextStatus::MediaChange - Media need to be swapped /*{{{*/ +// --------------------------------------------------------------------- +/* Prompt for a media swap */ +bool AcqTextStatus::MediaChange(string Media,string Drive) +{ + if (Quiet <= 0) + cout << '\r' << BlankLine << '\r'; + cout << "Media Change: Please insert the Disc labeled '" << Media << "' in "\ + " the drive '" << Drive << "' and press a key" << endl; + + char C; + read(STDIN_FILENO,&C,1); + + Update = true; + return true; +} + /*}}}*/ diff --git a/cmdline/acqprogress.h b/cmdline/acqprogress.h index 9dd5c60c..8cee3cd2 100644 --- a/cmdline/acqprogress.h +++ b/cmdline/acqprogress.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acqprogress.h,v 1.2 1998/11/12 05:30:09 jgg Exp $ +// $Id: acqprogress.h,v 1.3 1998/12/04 21:16:53 jgg Exp $ /* ###################################################################### Acquire Progress - Command line progress meter @@ -21,6 +21,7 @@ class AcqTextStatus : public pkgAcquireStatus public: + virtual bool MediaChange(string Media,string Drive); virtual void IMSHit(pkgAcquire::ItemDesc &Itm); virtual void Fetch(pkgAcquire::ItemDesc &Itm); virtual void Done(pkgAcquire::ItemDesc &Itm); diff --git a/doc/method.sgml b/doc/method.sgml index 35070d91..d1ebddcf 100644 --- a/doc/method.sgml +++ b/doc/method.sgml @@ -4,7 +4,7 @@ APT Method Interface Jason Gunthorpe jgg@debian.org -$Id: method.sgml,v 1.4 1998/10/30 07:53:49 jgg Exp $ +$Id: method.sgml,v 1.5 1998/12/04 21:16:54 jgg Exp $ This document describes the interface that APT uses to the archive @@ -207,6 +207,8 @@ The following is a short index of the header fields that are supported SiteString indicating the site authorization is required for UserUsername for authorization PasswordPassword for authorization +FailOperation failed +DriveDrive the media should be placed in Config-Item A string of the form item=value derived from the APT configuration space. These may include method specific values and general @@ -214,9 +216,8 @@ values not related to the method. It is up to the method to filter out the ones it wants. Single-InstanceRequires that only one instance of the method be run This is a yes/no value. -Pre-ScanMethod can detect if archives are already available. - This is a yes/no value. PipelineThe method is capable of pipelining. +LocalThe method only returns Filename: feilds. Send-ConfigSend configuration to the method. VersionVersion string for the method @@ -279,7 +280,7 @@ Fields: Site 403 Media Failure A method that deals with multiple media requires that a new media be inserted. The Media field contains the name of the media to be inserted. -Fields: Media +Fields: Media, Drive 600 URI Acquire APT is requesting that a new URI be added to the acquire list. Last-Modified @@ -301,7 +302,7 @@ Fields: Site, User, Password 603 Media Changed This is sent in response to a 403 Media Failure message. It indicates that the user has changed media and it is safe to proceed. -Fields: Media +Fields: Media, Fail -- 2.20.1