summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-12-17 23:19:37 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2008-12-17 23:19:37 +0100
commit6f388ec39823d67a233e8ad7949077b9c9f36707 (patch)
tree98eed2364a961a4781cc78cdb02fb2803fe1aa58
parenta0e96b87e1f9e2b924dd473b7a29272f88c461bb (diff)
* apt-inst/contrib/arfile.cc:
- support members ending with '/' as well (thanks to Michal Cihr, closes: #500988)
-rw-r--r--apt-inst/contrib/arfile.cc2
-rw-r--r--debian/changelog3
2 files changed, 4 insertions, 1 deletions
diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index a1fb97b48..7c85f2e86 100644
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -111,7 +111,7 @@ bool ARArchive::LoadHeaders()
else
{
unsigned int I = sizeof(Head.Name) - 1;
- for (; Head.Name[I] == ' '; I--);
+ for (; Head.Name[I] == ' ' || Head.Name[I] == '/'; I--);
Memb->Name = string(Head.Name,I+1);
}
diff --git a/debian/changelog b/debian/changelog
index 35a8fb2b4..2d765c6a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ apt (0.7.20) unstable; urgency=low
This is controlled via the value of
APT::Get::Build-Dep-Automatic and is set "false" by default.
Thanks to Aaron Haviland, closes: #448743
+ * apt-inst/contrib/arfile.cc:
+ - support members ending with '/' as well (thanks to Michal Cihr,
+ closes: #500988)
[ Christian Perrier ]
* Translations: