/*}}}*/
/* Done:
- * - works with http only
+ * - works with http (only!)
* - always picks the first mirror from the list
* - call out to problem reporting script
* - supports "deb mirror://host/path/to/mirror-list/// dist component"
+ * - uses pkgAcqMethod::FailReason() to have a string representation
+ * of the failure that is also send to LP
*
* TODO:
- * what about gpgv failures? this should call-out to the problem reporting
- script, but we need to know what mirror was used -> just run pkgAcquire::Item::ReportMirrorFailure()
- * better standard format for errors to send back
- * - implement failure reporting at the pkgAcquire::Item::Failed() level
- but then we need to send back what uri exactly was failing
- [mvo: the problem with this approach is ::Failed() is not really
- called for all failures :/ e.g. md5sum mismatch in a archive
- is not]
* - deal with runing as non-root because we can't write to the lists
dir then -> use the cached mirror file
* - better method to download than having a pkgAcquire interface here
- * - magicmarker is evil, maybe just use a similar approach as in
- clean and read the sources.list and use the GetURI() method to find
- the prefix?
- * support more than http
+ * and better error handling there!
+ * - support more than http
* - testing :)
*/
MirrorMethod::MirrorMethod()
- : HttpMethod(), HasMirrorFile(false)
+ : HttpMethod(), DownloadedMirrorFile(false)
{
-#if 0
- HasMirrorFile=true;
- BaseUri="mirror://people.ubuntu.com/~mvo/mirror/mirrors";
- MirrorFile="/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_mirror_mirrors";
- Mirror="http://de.archive.ubuntu.com/ubuntu/";
-#endif
};
// HttpMethod::Configuration - Handle a configuration message /*{{{*/
if(Debug)
clog << "MirrorMethod::Clean(): " << Dir << endl;
+ if(Dir == "/")
+ return _error->Error("will not clean: '/'");
+
// read sources.list
pkgSourceList list;
list.ReadMainList();
string uri = (*I)->GetURI();
if(uri.substr(0,strlen("mirror://")) != string("mirror://"))
continue;
- string Marker = _config->Find("Acquire::Mirror::MagicMarker","///");
- string BaseUri = uri.substr(0,uri.find(Marker));
+ string BaseUri = uri.substr(0,uri.size()-1);
if (URItoFileName(BaseUri) == Dir->d_name)
break;
}
}
-bool MirrorMethod::GetMirrorFile(string uri)
+bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
{
- string Marker = _config->Find("Acquire::Mirror::MagicMarker","///");
- BaseUri = uri.substr(0,uri.find(Marker));
-
- string fetch = BaseUri;
- fetch.replace(0,strlen("mirror://"),"http://");
-
- // get new file
- MirrorFile = _config->FindDir("Dir::State::mirrors") + URItoFileName(BaseUri);
-
- if(Debug)
- {
- cerr << "base-uri: " << BaseUri << endl;
- cerr << "mirror-file: " << MirrorFile << endl;
- }
// check the file, if it is not older than RefreshInterval just use it
// otherwise try to get a new one
{
if(Debug)
clog << "Mirror file is in RefreshInterval" << endl;
- HasMirrorFile = true;
+ DownloadedMirrorFile = true;
return true;
}
if(Debug)
// not that great to use pkgAcquire here, but we do not have
// any other way right now
+ string fetch = BaseUri;
+ fetch.replace(0,strlen("mirror://"),"http://");
+
pkgAcquire Fetcher;
new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile);
bool res = (Fetcher.Run() == pkgAcquire::Continue);
if(res)
- HasMirrorFile = true;
+ DownloadedMirrorFile = true;
Fetcher.Shutdown();
return res;
}
bool MirrorMethod::SelectMirror()
{
+ // if we do not have a MirrorFile, fallback
+ if(!FileExists(MirrorFile))
+ {
+ // FIXME: fallback to a default mirror here instead
+ // and provide a config option to define that default
+ return _error->Error(_("No mirror file '%s' found "), MirrorFile.c_str());
+ }
+
// FIXME: make the mirror selection more clever, do not
// just use the first one!
+ // BUT: we can not make this random, the mirror has to be
+ // stable accross session, because otherwise we can
+ // get into sync issues (got indexfiles from mirror A,
+ // but packages from mirror B - one might be out of date etc)
ifstream in(MirrorFile.c_str());
getline(in, Mirror);
if(Debug)
return true;
}
+string MirrorMethod::GetMirrorFileName(string mirror_uri_str)
+{
+ /*
+ - a mirror_uri_str looks like this:
+ mirror://people.ubuntu.com/~mvo/apt/mirror/mirrors/dists/feisty/Release.gpg
+
+ - the matching source.list entry
+ deb mirror://people.ubuntu.com/~mvo/apt/mirror/mirrors feisty main
+
+ - we actually want to go after:
+ http://people.ubuntu.com/~mvo/apt/mirror/mirrors
+
+ And we need to save the BaseUri for later:
+ - mirror://people.ubuntu.com/~mvo/apt/mirror/mirrors
+
+ FIXME: what if we have two similar prefixes?
+ mirror://people.ubuntu.com/~mvo/mirror
+ mirror://people.ubuntu.com/~mvo/mirror2
+ then mirror_uri_str looks like:
+ mirror://people.ubuntu.com/~mvo/apt/mirror/dists/feisty/Release.gpg
+ mirror://people.ubuntu.com/~mvo/apt/mirror2/dists/feisty/Release.gpg
+ we search sources.list and find:
+ mirror://people.ubuntu.com/~mvo/apt/mirror
+ in both cases! So we need to apply some domain knowledge here :( and
+ check for /dists/ or /Release.gpg as suffixes
+ */
+ string name;
+ if(Debug)
+ std::cerr << "GetMirrorFileName: " << mirror_uri_str << std::endl;
+
+ // read sources.list and find match
+ vector<metaIndex *>::const_iterator I;
+ pkgSourceList list;
+ list.ReadMainList();
+ for(I=list.begin(); I != list.end(); I++)
+ {
+ string uristr = (*I)->GetURI();
+ if(Debug)
+ std::cerr << "Checking: " << uristr << std::endl;
+ if(uristr.substr(0,strlen("mirror://")) != string("mirror://"))
+ continue;
+ // find matching uri in sources.list
+ if(mirror_uri_str.substr(0,uristr.size()) == uristr)
+ {
+ if(Debug)
+ std::cerr << "found BaseURI: " << uristr << std::endl;
+ BaseUri = uristr.substr(0,uristr.size()-1);
+ }
+ }
+ // get new file
+ name = _config->FindDir("Dir::State::mirrors") + URItoFileName(BaseUri);
+
+ if(Debug)
+ {
+ cerr << "base-uri: " << BaseUri << endl;
+ cerr << "mirror-file: " << name << endl;
+ }
+ return name;
+}
+
// MirrorMethod::Fetch - Fetch an item /*{{{*/
// ---------------------------------------------------------------------
/* This adds an item to the pipeline. We keep the pipeline at a fixed
depth. */
bool MirrorMethod::Fetch(FetchItem *Itm)
{
- // select mirror only once per session
- if(!HasMirrorFile)
+ // the http method uses Fetch(0) as a way to update the pipeline,
+ // just let it do its work in this case - Fetch() with a valid
+ // Itm will always run before the first Fetch(0)
+ if(Itm == NULL)
+ return HttpMethod::Fetch(Itm);
+
+ // if we don't have the name of the mirror file on disk yet,
+ // calculate it now (can be derived from the uri)
+ if(MirrorFile.empty())
+ MirrorFile = GetMirrorFileName(Itm->Uri);
+
+ // download mirror file once (if we are after index files)
+ if(Itm->IndexFile && !DownloadedMirrorFile)
{
Clean(_config->FindDir("Dir::State::mirrors"));
- GetMirrorFile(Itm->Uri);
- SelectMirror();
+ DownloadMirrorFile(Itm->Uri);
}
+ if(Mirror.empty())
+ SelectMirror();
+
for (FetchItem *I = Queue; I != 0; I = I->Next)
{
if(I->Uri.find("mirror://") != string::npos)
- I->Uri.replace(0,BaseUri.size(),Mirror);
+ I->Uri.replace(0,BaseUri.size(), Mirror);
}
-
+
// now run the real fetcher
return HttpMethod::Fetch(Itm);
};
projects / apt.git / blobdiff