* apt-pkg/aptconfiguration.cc:

  - fix comparing for a empty string

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 14ee09e0d2ea7c5c34e6d5b6af02f5465a011edc..ca602d4bfd1df5fa17938e32c0aee7b1eb28332f 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -337,7 +337,7 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
                                char* arch = strtok(buf, " ");
                                while (arch != NULL) {
                                        for (; isspace(*arch) != 0; ++arch);
-                                       if (arch != '\0') {
+                                       if (arch[0] != '\0') {
                                                char const* archend = arch;
                                                for (; isspace(*archend) == 0 && *archend != '\0'; ++archend);
                                                archs.push_back(string(arch, (archend - arch)));

diff --git a/debian/changelog b/debian/changelog
index 346702c213d7c99957882ccde4430f4fe6b1c53f..cd52fe22a1a67ba04bc27b9b58a9226194cda55b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-apt (0.8.13.2ubuntu1) UNRELEASED; urgency=low
+apt (0.8.13.2ubuntu1) natty; urgency=low
 
   * merge fixes from debian-sid, most notable the handling of
     arch=all architectures in python-apt (LP: #733741)
+  * apt-pkg/aptconfiguration.cc:
+    - fix comparing for a empty string
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Apr 2011 10:40:09 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Apr 2011 13:19:56 +0200
 
 apt (0.8.13.2) unstable; urgency=low