summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-09-12 20:06:50 -0700
committerZac Medico <zmedico@gentoo.org>2013-09-12 20:06:50 -0700
commit5efeeb8fe8618e2ae8ecc6f774221746896774ee (patch)
tree8d08792377ea0a7724056406f077e2d76d2aa6de
parentEAPI="5-progress": Support case-insensitive matching of extensions in unpack(). (diff)
downloadportage-2.2.4.tar.gz
portage-2.2.4.tar.bz2
portage-2.2.4.zip
dohtml: restore behavior noted in bug #425214v2.2.4
This goes along with commit 2110ec6ed42fc306d5c25cbf970d013ff2a226fd, adding support for trailing /. as well, since it's used at least by distutils-r1.eclass.
-rwxr-xr-xbin/dohtml.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/dohtml.py b/bin/dohtml.py
index 500c52355..f98557f61 100755
--- a/bin/dohtml.py
+++ b/bin/dohtml.py
@@ -204,9 +204,10 @@ def main():
print("Allowed files :", options.allowed_files)
success = False
+ endswith_slash = (os.sep, os.sep + ".")
for x in args:
- trailing_slash = x[-1:] == os.sep
+ trailing_slash = x.endswith(endswith_slash)
x = normalize_path(x)
if trailing_slash:
# Modify behavior of basename and dirname