diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-08-22 03:39:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-08-22 03:39:14 +0000 |
| commit | 29477a8f8bdf972fbe854ce019d6f85f07f3777e (patch) | |
| tree | 0bb80411cb9a52a47a59b1413c70b68872487ecb | |
| parent | f7c00c611ee21949dfabf2fb2f9f1ad811b2e599 (diff) | |
| download | portage-29477a8f8bdf972fbe854ce019d6f85f07f3777e.tar.gz portage-29477a8f8bdf972fbe854ce019d6f85f07f3777e.tar.bz2 portage-29477a8f8bdf972fbe854ce019d6f85f07f3777e.zip | |
Bug #189743 - Add .jpeg to the list of extensions supported by dohtml.
svn path=/main/trunk/; revision=7653
| -rwxr-xr-x | bin/dohtml | 7 | ||||
| -rw-r--r-- | man/ebuild.5 | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/bin/dohtml b/bin/dohtml index 917ca1b52..5087ca430 100755 --- a/bin/dohtml +++ b/bin/dohtml @@ -14,8 +14,8 @@ # Detailed usage: # dohtml <list-of-files> # - will install the files in the list of files (space-separated list) into -# /usr/share/doc/${PF}/html, provided the file ends in .html, .png, .jpg -# or .css +# /usr/share/doc/${PF}/html, provided the file ends in .htm, .html, .css, +# .js, ,gif, .jpeg, .jpg, or .png. # dohtml -r <list-of-files-and-directories> # - will do as 'dohtml', but recurse into all directories, as long as the # directory name is not CVS @@ -80,7 +80,8 @@ class OptionsClass: if os.environ.has_key("_E_DOCDESTTREE_"): self.DOCDESTTREE = os.environ["_E_DOCDESTTREE_"] - self.allowed_exts = [ 'png', 'gif', 'html', 'htm', 'jpg', 'css', 'js' ] + self.allowed_exts = [ 'htm', 'html', 'css', 'js', + 'gif', 'jpeg', 'jpg', 'png' ] self.allowed_files = [] self.disallowed_dirs = [ 'CVS' ] self.recurse = False diff --git a/man/ebuild.5 b/man/ebuild.5 index f10e8c765..68b4f053a 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -775,7 +775,7 @@ Performs the ln command as either a hard link or symlink. .TP \fBdohtml\fR \fI [\-a filetypes] [\-r] [\-x list\-of\-dirs\-to\-ignore] [list\-of\-files\-and\-dirs]\fR Installs the files in the list of files (space\-separated list) into -/usr/share/doc/${PF}/html provided the file ends in .html, .htm, .gif, .jpg, .png, .js, or .css. +/usr/share/doc/${PF}/html provided the file ends in .htm, .html, .css, .js, .gif, .jpeg, .jpg, or .png. Setting \fI\-a\fR limits what types of files will be included, \fI\-A\fR appends to the default list, setting \fI\-x\fR sets which dirs to exclude (CVS excluded by default), \fI\-r\fR sets recursive. |