apt-cdrom architecture match always fails

[Colin Watson]

Binary package hint: apt

apt-cdrom is always failing in the installer right now, with apt 0.7.26~exp12ubuntu2. You can reproduce this by loop-mounting a current server image on /mnt and running:

  sudo apt-cdrom -d /mnt -m -n -o Debug::aptcdrom=true -o Acquire::cdrom::AutoDetect=false add

(Beware, this will replace /dev/null with a regular file and you'll have to put it back afterwards! But that's another bug ...)

It looks to me as though pkgCdrom::DropBinaryArch() is dropping one too many characters from the end of the architecture name before checking it against the current architecture. I'll attach a patch to fix this.

[Michael Vogt (mvo)]

Thanks a lot Colin for the fix!

apt (0.7.26~exp12ubuntu3) maverick; urgency=low

  [ Colin Watson ]
  * apt-pkg/cdrom.cc:
    - fix off-by-one error in DropBinaryArch