// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire-method.cc,v 1.9 1998/11/29 01:24:15 jgg Exp $
+// $Id: acquire-method.cc,v 1.10 1998/12/03 07:29:16 jgg Exp $
/* ######################################################################
Acquire Method
delete Tmp;
}
/*}}}*/
+// AcqMethod::MediaFail - Syncronous request for new media /*{{{*/
+// ---------------------------------------------------------------------
+/* This sends a 403 Media Failure message to the APT and waits for it
+ to be ackd */
+void pkgAcqMethod::MediaFail(string Required,string Drive)
+{
+ char S[1024];
+ snprintf(S,sizeof(S),"403 Media Failure\nMedia: %s\nDrive: %s\n\n",
+ Required.c_str(),Drive.c_str());
+
+ if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
+ exit(100);
+
+ vector<string> MyMessages;
+
+ /* Here we read messages until we find a 603, each non 603 message is
+ appended to the main message list for later processing */
+ while (1)
+ {
+ if (WaitFd(STDIN_FILENO) == false)
+ exit(0);
+
+ if (ReadMessages(STDIN_FILENO,MyMessages) == false)
+ exit(0);
+
+ string Message = MyMessages.front();
+ MyMessages.erase(MyMessages.begin());
+
+ // Fetch the message number
+ char *End;
+ int Number = strtol(Message.c_str(),&End,10);
+ if (End == Message.c_str())
+ {
+ cerr << "Malformed message!" << endl;
+ exit(100);
+ }
+
+ // Change ack
+ if (Number == 603)
+ {
+ while (Message.empty() == false)
+ {
+ Messages.push_back(MyMessages.front());
+ MyMessages.erase(MyMessages.begin());
+ }
+
+ return;
+ }
+
+ Messages.push_back(Message);
+ }
+}
+ /*}}}*/
// AcqMethod::Configuration - Handle the configuration message /*{{{*/
// ---------------------------------------------------------------------
/* This parses each configuration entry and puts it into the _config
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire-method.h,v 1.4 1998/11/29 01:24:16 jgg Exp $
+// $Id: acquire-method.h,v 1.5 1998/12/03 07:29:17 jgg Exp $
/* ######################################################################
Acquire Method - Method helper class + functions
void Fail(string Why, bool Transient = false);
void URIStart(FetchResult &Res);
void URIDone(FetchResult &Res,FetchResult *Alt = 0);
-
+ void MediaFail(string Required,string Drive);
+
public:
enum CnfFlags {SingleInstance = (1<<0),
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: strutl.cc,v 1.13 1998/11/05 07:21:44 jgg Exp $
+// $Id: strutl.cc,v 1.14 1998/12/03 07:29:18 jgg Exp $
/* ######################################################################
String Util - Some usefull string functions.
SingleSlash += 3;
for (; SingleSlash < U.end() && *SingleSlash != '/'; SingleSlash++);
if (SingleSlash > U.end())
- SingleSlash = U.end();
+ SingleSlash = U.end();
// We can now write the access and path specifiers
Access = string(U,0,FirstColon - U.begin());
Path = "/";
// Now we attempt to locate a user:pass@host fragment
- FirstColon += 3;
+ if (U[1] == '/' && U[2] == '/')
+ FirstColon += 3;
+ else
+ FirstColon += 1;
if (FirstColon >= U.end())
return;
#30027: apt: version comparison bug
Summary: Version compare differs from dpkg
Status: Fixed in all CVS versions.
-
+#30260: apt: wishlist: do not return to main menu without prompting for return
+ Summary: Wants to prompt after dselect update
+ Status: Fixed in v3, use dselect::promptafterupdate "true";
+
-- Silly things
#26592: apt: Problems with ftpd in SunOS 5.6
#29903: apt-get insists onto sending a SIZE command
--- /dev/null
+// -*- mode: cpp; mode: fold -*-
+// Description /*{{{*/
+// $Id: cdrom.cc,v 1.1 1998/12/03 07:29:21 jgg Exp $
+/* ######################################################################
+
+ CDROM URI method for APT
+
+ ##################################################################### */
+ /*}}}*/
+// Include Files /*{{{*/
+#include <apt-pkg/acquire-method.h>
+#include <apt-pkg/cdromutl.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/fileutl.h>
+
+#include <sys/stat.h>
+#include <unistd.h>
+ /*}}}*/
+
+class CDROMMethod : public pkgAcqMethod
+{
+ Configuration Database;
+ string CurrentID;
+
+ virtual bool Fetch(FetchItem *Itm);
+ string GetID(string Name);
+
+ public:
+
+ CDROMMethod();
+};
+
+// CDROMMethod::CDROMethod - Constructor /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly)
+{
+ // Read the database
+ string DFile = _config->FindFile("Dir::State::cdroms");
+ if (FileExists(DFile) == true)
+ {
+ if (ReadConfigFile(Database,DFile) == false)
+ {
+ _error->Error("Unable to read the cdrom database %s",
+ DFile.c_str());
+ Fail();
+ }
+ }
+};
+ /*}}}*/
+// CDROMMethod::GetID - Get the ID hash for /*{{{*/
+// ---------------------------------------------------------------------
+/* We search the configuration space for the name and then return the ID
+ tag associated with it. */
+string CDROMMethod::GetID(string Name)
+{
+ const Configuration::Item *Top = Database.Tree(0);
+ for (; Top != 0;)
+ {
+ if (Top->Value == Name)
+ return Top->Tag;
+
+ Top = Top->Next;
+ }
+
+ return string();
+}
+ /*}}}*/
+// CDROMMethod::Fetch - Fetch a file /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CDROMMethod::Fetch(FetchItem *Itm)
+{
+ URI Get = Itm->Uri;
+ string File = Get.Path;
+ FetchResult Res;
+
+ /* All IMS queries are returned as a hit, CDROMs are readonly so
+ time stamps never change */
+ if (Itm->LastModified != 0)
+ {
+ Res.LastModified = Itm->LastModified;
+ Res.IMSHit = true;
+ URIDone(Res);
+ return true;
+ }
+
+ string ID = GetID(Get.Host);
+
+ // All non IMS queries for package files fail.
+ if (Itm->IndexFile == true || ID.empty() == false)
+ {
+ Fail("Please use apt-cdrom to make this CD recognized by APT."
+ " apt-get update cannot be used to add new CDs");
+ return true;
+ }
+
+ // We already have a CD inserted, but it is the wrong one
+ if (CurrentID.empty() == false && ID != CurrentID)
+ {
+ Fail("Wrong CD",true);
+ return true;
+ }
+
+ string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+ string NewID;
+ while (1)
+ {
+ if (IdentCdrom(CDROM,NewID) == false)
+ return false;
+
+ // A hit
+ if (NewID == ID)
+ break;
+
+ UnmountCdrom(CDROM);
+ MediaFail(Get.Host,CDROM);
+ MountCdrom(CDROM);
+ }
+
+ // ID matches
+ if (NewID == ID)
+ {
+ Res.Filename = CDROM + File;
+ if (FileExists(Res.Filename) == false)
+ return _error->Error("File not found");
+
+ CurrentID = ID;
+ Res.LastModified = Itm->LastModified;
+ Res.IMSHit = true;
+ URIDone(Res);
+ return true;
+ }
+
+ return _error->Error("CDROM not found");
+}
+ /*}}}*/
+
+int main()
+{
+ CDROMMethod Mth;
+ return Mth.Run();
+}
SOURCE = gzip.cc
include $(PROGRAM_H)
+# The cdrom method
+PROGRAM=cdrom
+SLIBS = -lapt-pkg
+SOURCE = cdrom.cc
+include $(PROGRAM_H)
+
# The http method
PROGRAM=http
SLIBS = -lapt-pkg
{
signal(SIGPIPE,SIG_IGN);
-/* URI Foo(argv[1]);
+ URI Foo(argv[1]);
cout << Foo.Access << '\'' << endl;
cout << Foo.Host << '\'' << endl;
cout << Foo.Path << '\'' << endl;
cout << Foo.Password << '\'' << endl;
cout << Foo.Port << endl;
- return 0;*/
+ return 0;
pkgInitialize(*_config);
# 0 means that ver1 = ver2
7.6p2-4 7.6-0 1
1.0.3-3 1.0-1 1
+1.3 1.2.2-2 1
+1.3 1.2.2 1
# Important attributes
- . -1
HCoop / ntk / apt.git / commitdiff