diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-08-02 21:05:18 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-08-02 21:05:18 +0200 |
| commit | 5368af78fb6c996c8ee24e5cf8f645cf00259ead (patch) | |
| tree | c6436d04572b3c518394a878e7dffb2914b1ea6c | |
| parent | 82cb2b8140fbe21a7000fcf2f3641f18fd0c0d27 (diff) | |
| parent | 73dfa041545d34b79a4dd25a0baa3e64f5564a62 (diff) | |
* apt-pkg/cdrom.cc:
- fix off-by-one error in DropBinaryArch
| -rw-r--r-- | apt-pkg/cdrom.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index e3e0027fc..0e36f44a2 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -229,7 +229,7 @@ bool pkgCdrom::DropBinaryArch(vector<string> &List) // Between Start and End is the architecture Start += 8; if ((End = strstr(Start,"/")) != 0 && Start != End && - APT::Configuration::checkArchitecture(string(Start, --End)) == true) + APT::Configuration::checkArchitecture(string(Start, End)) == true) continue; // okay, architecture is accepted // not accepted -> Erase it diff --git a/debian/changelog b/debian/changelog index 9434dfd8e..e90aebef6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.26~exp12ubuntu3) maverick; urgency=low + + [ Colin Watson ] + * apt-pkg/cdrom.cc: + - fix off-by-one error in DropBinaryArch + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 02 Aug 2010 21:04:18 +0200 + apt (0.7.26~exp12ubuntu2) maverick; urgency=low * debian/apt.postinst: |