From e75f306ea9596c82e3b0c188e9b5203fc9d619da Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Feb 2005 12:12:46 +0000 Subject: * added gpgv::Options to configure-index --- doc/examples/configure-index | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/examples/configure-index b/doc/examples/configure-index index c834c49d5..3538deebd 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -142,6 +142,11 @@ Acquire UMount "sleep 500"; } }; + + gpgv + { + Options {"--ignore-time-conflict";} // not very usefull on a normal system + }; }; // Directory layout -- cgit v1.2.3-70-g09d2 From 1c5f7e5fc5c0377718d203e78d4af164ee3e60f8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Feb 2005 23:23:23 +0000 Subject: * PulseIntervall can be configured now to make frontends like synaptic hayppy. it's done in a way that does not break binary compatibility --- apt-pkg/acquire.cc | 6 +++--- apt-pkg/acquire.h | 3 ++- po/apt-all.pot | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 3c207fd27..70dce4f54 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -312,7 +312,7 @@ void pkgAcquire::RunFds(fd_set *RSet,fd_set *WSet) /* This runs the queues. It manages a select loop for all of the Worker tasks. The workers interact with the queues and items to manage the actual fetch. */ -pkgAcquire::RunResult pkgAcquire::Run() +pkgAcquire::RunResult pkgAcquire::Run(int PulseIntervall) { Running = true; @@ -327,7 +327,7 @@ pkgAcquire::RunResult pkgAcquire::Run() // Run till all things have been acquired struct timeval tv; tv.tv_sec = 0; - tv.tv_usec = 500000; + tv.tv_usec = PulseIntervall; while (ToFetch > 0) { fd_set RFds; @@ -357,7 +357,7 @@ pkgAcquire::RunResult pkgAcquire::Run() // Timeout, notify the log class if (Res == 0 || (Log != 0 && Log->Update == true)) { - tv.tv_usec = 500000; + tv.tv_usec = PulseIntervall; for (Worker *I = Workers; I != 0; I = I->NextAcquire) I->Pulse(); if (Log != 0 && Log->Pulse(this) == false) diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 65c53a953..3e338b220 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -100,7 +100,8 @@ class pkgAcquire enum RunResult {Continue,Failed,Cancelled}; - RunResult Run(); + RunResult Run() { return Run(500000); }; // Binary compatibility + RunResult Run(int PulseIntervall); void Shutdown(); // Simple iteration mechanism diff --git a/po/apt-all.pot b/po/apt-all.pot index 4fbd34e4e..23a0ad16c 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-09 12:51+0100\n" +"POT-Creation-Date: 2005-02-11 00:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3-70-g09d2 From 2aab5956ebcaec3aa6c71f069a202366c872bb87 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 25 Feb 2005 13:26:58 +0000 Subject: * fix for apt-get update removing the cdroms Release.gpg files --- apt-pkg/acquire-item.cc | 12 +----------- methods/cdrom.cc | 2 +- po/apt-all.pot | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index de8cfe8f2..714edd8d8 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -350,18 +350,8 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, /* The only header we use is the last-modified header. */ string pkgAcqMetaSig::Custom600Headers() { - // mvo: we don't really need the last-modified header here - // 1) it points to "Final" and that was renamed to "DestFile" - // so it's never send anyway - // 2) because DestFIle is in partial/ we will send a partial request - // with if-range in the http method (or the equivalent for ftp). - // that should give the same result - - string Final = _config->FindDir("Dir::State::lists"); - Final += URItoFileName(RealURI); - struct stat Buf; - if (stat(Final.c_str(),&Buf) != 0) + if (stat(DestFile.c_str(),&Buf) != 0) return "\nIndex-File: true"; return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); diff --git a/methods/cdrom.cc b/methods/cdrom.cc index d5987dc45..d8bb9522e 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -97,7 +97,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) { Res.LastModified = Itm->LastModified; Res.IMSHit = true; - Res.Filename = File; + Res.Filename = Itm->DestFile; URIDone(Res); return true; } diff --git a/po/apt-all.pot b/po/apt-all.pot index 23a0ad16c..d40d44701 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-11 00:08+0100\n" +"POT-Creation-Date: 2005-02-08 16:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3-70-g09d2 From 872b3d3983839d2d9f14268c5adf976a72ecc5ad Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 25 Feb 2005 22:59:38 +0000 Subject: * path scoring changed, the non-symlink path is scored highest --- apt-pkg/cdrom.cc | 17 +++++++++++++++++ po/apt-all.pot | 42 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index a91fc7181..1b9e98519 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -169,6 +169,23 @@ int pkgCdrom::Score(string Path) Res += 10; if (Path.find("/debian/") != string::npos) Res -= 10; + + // check for symlinks in the patch leading to the actual file + // a symlink gets a big penalty + struct stat Buf; + string statPath = flNotFile(Path); + string cdromPath = _config->FindDir("Acquire::cdrom::mount","/cdrom/"); + while(statPath != cdromPath && statPath != "./") { + statPath.resize(statPath.size()-1); // remove the trailing '/' + if (lstat(statPath.c_str(),&Buf) == 0) { + if(S_ISLNK(Buf.st_mode)) { + Res -= 60; + break; + } + } + statPath = flNotFile(statPath); // descent + } + return Res; } diff --git a/po/apt-all.pot b/po/apt-all.pot index d40d44701..45ea52b09 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-08 16:58+0100\n" +"POT-Creation-Date: 2005-02-25 14:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2259,31 +2259,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:718 +#: apt-pkg/acquire-item.cc:708 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:771 +#: apt-pkg/acquire-item.cc:761 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:807 +#: apt-pkg/acquire-item.cc:797 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:884 msgid "Size mismatch" msgstr "" @@ -2292,73 +2292,73 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:487 +#: apt-pkg/cdrom.cc:503 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578 +#: apt-pkg/cdrom.cc:512 apt-pkg/cdrom.cc:594 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:521 +#: apt-pkg/cdrom.cc:537 #, c-format msgid "Stored Label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:557 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:559 +#: apt-pkg/cdrom.cc:575 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:563 +#: apt-pkg/cdrom.cc:579 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:571 +#: apt-pkg/cdrom.cc:587 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:589 +#: apt-pkg/cdrom.cc:605 msgid "Scanning Disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:627 +#: apt-pkg/cdrom.cc:643 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:684 +#: apt-pkg/cdrom.cc:700 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:700 +#: apt-pkg/cdrom.cc:716 #, c-format msgid "" "This Disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:704 +#: apt-pkg/cdrom.cc:720 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:744 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:737 +#: apt-pkg/cdrom.cc:753 msgid "Source List entries for this Disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:771 +#: apt-pkg/cdrom.cc:787 msgid "Unmounting CD-ROM..." msgstr "" -- cgit v1.2.3-70-g09d2