* apt-pkg/aptconfiguration.cc:

  - ensure that native architecture is if not specified otherwise the
    first architecture in the Architectures vector

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index e8c8e73d0b042919e408beb77f9f91d355323daf..9ccbeecf1c0f299f8d6f93f0bdb4953df2358a78 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -352,7 +352,7 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
 
        if (archs.empty() == true ||
            std::find(archs.begin(), archs.end(), arch) == archs.end())
-               archs.push_back(arch);
+               archs.insert(archs.begin(), arch);
 
        // erase duplicates and empty strings
        for (std::vector<string>::reverse_iterator a = archs.rbegin();

diff --git a/debian/changelog b/debian/changelog
index c9659395fe94e8944f5396f0141e29337b53700e..76d5a218315017b00435f1680af18a5b44d56db2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,8 +31,11 @@ apt (0.8.15.3) UNRELEASED; urgency=low
     - apply madison typofix from John Feuerstein, thanks! (Closes: #633455)
   * apt-pkg/policy.cc:
     - emit an error on unknown APT::Default-Release value (Closes: #407511)
+  * apt-pkg/aptconfiguration.cc:
+    - ensure that native architecture is if not specified otherwise the
+      first architecture in the Architectures vector
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 24 Jul 2011 18:41:43 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 25 Jul 2011 12:36:07 +0200
 
 apt (0.8.15.2) unstable; urgency=high