From: Lars Gustäbel <lars@gustaebel.de>
Date: Fri, 20 Apr 2007 14:49:02 +0000 (+0000)
Subject: Fix directory names to have only one trailing slash.
X-Git-Tag: v2.5.2c1~352
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d220144a84b71d4d6a35d68b091a45780c5e5162;p=thirdparty%2FPython%2Fcpython.git

Fix directory names to have only one trailing slash.
A regression from rev. 52525.
---

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 4c7dadbc6ad7..261d9fbc3620 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1842,7 +1842,7 @@ class TarFile(object):
             tarinfo.type = DIRTYPE
 
         # Directory names should have a '/' at the end.
-        if tarinfo.isdir():
+        if tarinfo.isdir() and not tarinfo.name.endswith("/"):
             tarinfo.name += "/"
 
         self.members.append(tarinfo)
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index 692d72a17cca..b1cbcf69c306 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -191,6 +191,13 @@ class ReadTest(BaseTest):
             except:
                 pass
 
+    def test_dirtype(self):
+        for tarinfo in self.tar:
+            if tarinfo.isdir():
+                self.assert_(tarinfo.name.endswith("/"))
+                self.assert_(not tarinfo.name[:-1].endswith("/"))
+
+
 class ReadStreamTest(ReadTest):
     sep = "|"
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 6475b767d543..58f87eac6621 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -4,6 +4,17 @@ Python News
 
 (editors: check NEWS.help for information about editing NEWS using ReST.)
 
+What's New in Python 2.5.2c1?
+=============================
+
+*Release date: XX-XXX-XXXX*
+
+Library
+-------
+
+- tarfile.py: Fix directory names to have only one trailing slash.
+
+
 What's New in Python 2.5.1?
 =============================