aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Jones <carpaski@gentoo.org>2004-10-10 10:07:21 +0000
committerNicholas Jones <carpaski@gentoo.org>2004-10-10 10:07:21 +0000
commit94b584e2642672ea8ca8b8b78b4d32c1f57c4aff (patch)
tree313d3ddeac15c1192575c96f4fbe62bab968f15f /bin/dohtml
parentupdate info about --prune to reflect the broken behavior it exhibits (diff)
downloadportage-cvs-94b584e2642672ea8ca8b8b78b4d32c1f57c4aff.tar.gz
portage-cvs-94b584e2642672ea8ca8b8b78b4d32c1f57c4aff.tar.bz2
portage-cvs-94b584e2642672ea8ca8b8b78b4d32c1f57c4aff.zip
_rc8, basically.
Lots of little cleanups. Solar's patch for sandbox. Spanky's patches on various outstanding bugs.
Diffstat (limited to 'bin/dohtml')
-rwxr-xr-xbin/dohtml4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/dohtml b/bin/dohtml
index 36fa43d..bb87b78 100755
--- a/bin/dohtml
+++ b/bin/dohtml
@@ -1,7 +1,7 @@
#!/usr/bin/python
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dohtml,v 1.13 2004/10/04 13:56:50 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dohtml,v 1.14 2004/10/10 10:07:20 carpaski Exp $
# Author Karl Trygve Kalleberg <karltk@gentoo.org>
#
@@ -58,7 +58,7 @@ def install(basename, dirname, options, prefix=""):
if os.path.isfile(fullpath):
ext = os.path.splitext(basename)[1]
- if len(ext) and ext[1:] in options.allowed_exts:
+ if (len(ext) and ext[1:] in options.allowed_exts) or basename in options.allowed_files:
dodir(destdir)
dofile(fullpath, destdir + "/" + basename)
elif options.recurse and os.path.isdir(fullpath) and \