merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

[apt.git] / apt-pkg / deb / debmetaindex.cc

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index e1f8219e361b314c066084d18e80ec87558cfa8f..7a88d71e3e36be9e22dc4878dd7f10e3cc0b308b 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -1,14 +1,19 @@
 // ijones, walters
+#include <config.h>
 
 #include <apt-pkg/debmetaindex.h>
 #include <apt-pkg/debindexfile.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/indexrecords.h>
+#include <apt-pkg/sourcelist.h>
 #include <apt-pkg/error.h>
 
 #include <set>
+#include <algorithm>
 
 using namespace std;
 
@@ -123,7 +128,7 @@ string debReleaseIndex::TranslationIndexURISuffix(const char *Type, const string
 {
    string Res ="";
    if (Dist[Dist.size() - 1] != '/')
-      Res += Section + "/i18n/";
+      Res += Section + "/i18n/Translation-";
    return Res + Type;
 }
 
@@ -197,36 +202,25 @@ vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
                }
        }
 
-       std::vector<std::string> const lang = APT::Configuration::getLanguages(true);
+       std::vector<std::string> lang = APT::Configuration::getLanguages(true);
+       std::vector<std::string>::iterator lend = std::remove(lang.begin(), lang.end(), "none");
+       if (lend != lang.end())
+               lang.erase(lend);
+
        if (lang.empty() == true)
                return IndexTargets;
 
-       // get the Translations:
-       // - if its a dists-style repository get the i18n/Index first
-       // - if its flat try to acquire files by guessing
-       if (Dist[Dist.size() - 1] == '/') {
-               for (std::set<std::string>::const_iterator s = sections.begin();
-                    s != sections.end(); ++s) {
-                       for (std::vector<std::string>::const_iterator l = lang.begin();
-                            l != lang.end(); ++l) {
-                               if (*l == "none") continue;
-                               IndexTarget * Target = new OptionalIndexTarget();
-                               Target->ShortDesc = "Translation-" + *l;
-                               Target->MetaKey = TranslationIndexURISuffix(l->c_str(), *s);
-                               Target->URI = TranslationIndexURI(l->c_str(), *s);
-                               Target->Description = Info (Target->ShortDesc.c_str(), *s);
-                               IndexTargets->push_back(Target);
-                       }
-               }
-       } else {
-               for (std::set<std::string>::const_iterator s = sections.begin();
-                    s != sections.end(); ++s) {
+       // get the Translation-* files, later we will skip download of non-existent if we have an index
+       for (std::set<std::string>::const_iterator s = sections.begin();
+            s != sections.end(); ++s) {
+               for (std::vector<std::string>::const_iterator l = lang.begin();
+                    l != lang.end(); ++l) {
                        IndexTarget * Target = new OptionalIndexTarget();
-                       Target->ShortDesc = "TranslationIndex";
-                       Target->MetaKey = TranslationIndexURISuffix("Index", *s);
-                       Target->URI = TranslationIndexURI("Index", *s);
+                       Target->ShortDesc = "Translation-" + *l;
+                       Target->MetaKey = TranslationIndexURISuffix(l->c_str(), *s);
+                       Target->URI = TranslationIndexURI(l->c_str(), *s);
                        Target->Description = Info (Target->ShortDesc.c_str(), *s);
-                       IndexTargets->push_back (Target);
+                       IndexTargets->push_back(Target);
                }
        }
 
@@ -235,6 +229,8 @@ vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
                                                                        /*}}}*/
 bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
 {
+   bool const tryInRelease = _config->FindB("Acquire::TryInRelease", true);
+
    // special case for --print-uris
    if (GetAll) {
       vector <struct IndexTarget *> *targets = ComputeIndexTargets();
@@ -242,16 +238,32 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
         new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description,
                         (*Target)->ShortDesc, HashString());
       }
+
+      // this is normally created in pkgAcqMetaSig, but if we run
+      // in --print-uris mode, we add it here
+      if (tryInRelease == false)
+        new pkgAcqMetaIndex(Owner, MetaIndexURI("Release"),
+              MetaIndexInfo("Release"), "Release",
+              MetaIndexURI("Release.gpg"),
+              ComputeIndexTargets(),
+              new indexRecords (Dist));
    }
 
-       new pkgAcqMetaClearSig(Owner, MetaIndexURI("InRelease"),
-               MetaIndexInfo("InRelease"), "InRelease",
-               MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release",
-               MetaIndexURI("Release.gpg"), MetaIndexInfo("Release.gpg"), "Release.gpg",
-               ComputeIndexTargets(),
-               new indexRecords (Dist));
+   if (tryInRelease == true)
+      new pkgAcqMetaClearSig(Owner, MetaIndexURI("InRelease"),
+           MetaIndexInfo("InRelease"), "InRelease",
+           MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release",
+           MetaIndexURI("Release.gpg"), MetaIndexInfo("Release.gpg"), "Release.gpg",
+           ComputeIndexTargets(),
+           new indexRecords (Dist));
+   else
+      new pkgAcqMetaSig(Owner, MetaIndexURI("Release.gpg"),
+           MetaIndexInfo("Release.gpg"), "Release.gpg",
+           MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release",
+           ComputeIndexTargets(),
+           new indexRecords (Dist));
 
-       return true;
+   return true;
 }
 
 void debReleaseIndex::SetTrusted(bool const Trusted)