summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-04-30 04:42:44 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-04-30 04:42:44 +0000
commit6f701758724cadfe5f7898693f0fa9c0f6dbb2b1 (patch)
tree6c6b800469e00330c2533ae1dbabdbe02d9743bb
parentdocument the -i18n option of doman and fix highlighting of options in dohtml (diff)
downloadportage-cvs-6f701758724cadfe5f7898693f0fa9c0f6dbb2b1.tar.gz
portage-cvs-6f701758724cadfe5f7898693f0fa9c0f6dbb2b1.tar.bz2
portage-cvs-6f701758724cadfe5f7898693f0fa9c0f6dbb2b1.zip
Added Mike's patch to broaden the accepted man pages from [1-8n] to
[0-9n](|f|p|pm)
-rw-r--r--ChangeLog5
-rwxr-xr-xbin/doman10
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a6c7e8..9b9a328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for Portage; the Gentoo Linux ports system
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.796.2.111 2005/04/29 17:43:21 jstubbs Exp $
+# $Id: ChangeLog,v 1.796.2.112 2005/04/30 04:42:44 jstubbs Exp $
MAJOR CHANGES in 2.0.51:
1. /var/cache/edb/virtuals is no longer used at all. It's calculated now.
2. /var/cache/edb/world is now /var/lib/portage/world.
3. /etc/portage/profile/virtuals is _USER_ configs only.
+ 29 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> bin/doman: Added Mike's
+ patch to broaden the accepted man pages from [1-8n] to [0-9n](|f|p|pm)
+
29 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> bin/emerge pym/portage.py:
Added an implementation for the emerge config action and a supporting
method findname on the vardbapi class.
diff --git a/bin/doman b/bin/doman
index 2de27ab..750fd7f 100755
--- a/bin/doman
+++ b/bin/doman
@@ -1,7 +1,7 @@
#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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/doman,v 1.13 2004/10/10 10:07:20 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doman,v 1.13.2.1 2005/04/30 04:42:44 jstubbs Exp $
if [ ${#} -lt 1 ] ; then
echo "${0}: at least one argument needed" 1>&2
@@ -53,7 +53,7 @@ for x in "$@" ; do
mandir=${i18n}man${suffix:0:1}
- if echo ${mandir} | egrep -q 'man[1-8n]$' -; then
+ if echo ${mandir} | egrep -q 'man[0-9n](|f|p|pm)$' -; then
if [ -e "${x}" ] ; then
if [ ! -d "${D}${BASE}/man/${mandir}" ] ; then
install -d "${D}${BASE}/man/${mandir}"
@@ -65,9 +65,9 @@ for x in "$@" ; do
gzip -f -9 "${D}${BASE}/man/${mandir}/${x##*/}"
fi
else
- echo "doman: ${x} does not exist." 1>&2
+ echo "doman: ${x} does not exist" 1>&2
fi
else
- echo -e "\adoman: '${x}' is probably not a man page." 1>&2
+ echo -e "\adoman: '${x}' is probably not a man page; skipping" 1>&2
fi
done