diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-05 13:26:33 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-05 13:26:33 +0200 |
| commit | e838068b8da7dc1e1b67c6e6ed6d33a496ab34b7 (patch) | |
| tree | 3185b42ce268307395af29b46d457b6d579146b3 | |
| parent | a70b91850530b48f5a15bee95d80a3941cf6e85c (diff) | |
| parent | bdb3d92cd2d96909eecc5d972206dc761f278381 (diff) | |
* apt-pkg/aptconfiguration.cc:
- fix comparing for a empty string
| -rw-r--r-- | apt-pkg/aptconfiguration.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 14ee09e0d..ca602d4bf 100644 --- 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 346702c21..cd52fe22a 100644 --- 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 |