diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-07-25 12:37:06 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-07-25 12:37:06 +0200 |
| commit | bd9d81e3d793b9fb5c94fd5ad0b00245205b8cbc (patch) | |
| tree | 4933781e6abcaabd1805811b38f97f48637b1d74 | |
| parent | ac32148639b3a35bc359275b9265f41f81e29296 (diff) | |
* apt-pkg/aptconfiguration.cc:
- ensure that native architecture is if not specified otherwise the
first architecture in the Architectures vector
| -rw-r--r-- | apt-pkg/aptconfiguration.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index e8c8e73d0..9ccbeecf1 100644 --- 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 c9659395f..76d5a2183 100644 --- 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 |