diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-01-27 05:44:45 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-01-27 05:44:45 +0000 |
| commit | e50dee5d726a86c45779aa81c10ed4394d93a176 (patch) | |
| tree | 0054329e9f526b89c88cc4ad9c948a6b89f5c66b /sys-apps/man/files | |
| parent | The requirement for automake 1.7 wasn't superfluous (diff) | |
| download | gentoo-2-e50dee5d726a86c45779aa81c10ed4394d93a176.tar.gz gentoo-2-e50dee5d726a86c45779aa81c10ed4394d93a176.tar.bz2 gentoo-2-e50dee5d726a86c45779aa81c10ed4394d93a176.zip | |
Dont update whatis on read-only filesystems #163932 by Doug Goldstein.
(Portage version: 2.1.2-r4)
Diffstat (limited to 'sys-apps/man/files')
| -rw-r--r-- | sys-apps/man/files/digest-man-1.6e-r3 | 3 | ||||
| -rw-r--r-- | sys-apps/man/files/man-1.6e-readonly-whatis.patch | 56 | ||||
| -rw-r--r-- | sys-apps/man/files/man-1.6e-readonly-whatis2.patch | 47 |
3 files changed, 106 insertions, 0 deletions
diff --git a/sys-apps/man/files/digest-man-1.6e-r3 b/sys-apps/man/files/digest-man-1.6e-r3 new file mode 100644 index 000000000000..69ec127910e1 --- /dev/null +++ b/sys-apps/man/files/digest-man-1.6e-r3 @@ -0,0 +1,3 @@ +MD5 d8187cd756398baefc48ba7d60ff6a8a man-1.6e.tar.gz 252657 +RMD160 486099dc1b34fe86a2c1d19b7c89dc19b9787837 man-1.6e.tar.gz 252657 +SHA256 022faf23844eabb3662eabb105836925dd83bedda10271e2450a5bc5b61a5b5f man-1.6e.tar.gz 252657 diff --git a/sys-apps/man/files/man-1.6e-readonly-whatis.patch b/sys-apps/man/files/man-1.6e-readonly-whatis.patch new file mode 100644 index 000000000000..d0f8ce1aab9a --- /dev/null +++ b/sys-apps/man/files/man-1.6e-readonly-whatis.patch @@ -0,0 +1,56 @@ +Dont update makewhatis files if they're on readonly filesystems + +http://bugs.gentoo.org/163932 + +--- src/makewhatis.sh ++++ src/makewhatis.sh +@@ -184,6 +188,34 @@ + if [ x$verbose != x ]; then + echo "about to enter $mandir" > /dev/stderr + fi ++ ++ # kludge for Slackware's /usr/man/preformat ++ if [ $mandir = /usr/man/preformat ] ++ then ++ mandir1=/usr/man ++ else ++ mandir1=$mandir ++ fi ++ ++ # if $mandir is on a readonly partition, and the whatis file ++ # is not a symlink, then let's skip trying to update it ++ if [ ! -L ${mandir1}/whatis ] ++ then ++ if [ -e ${mandir1}/whatis ] && [ ! -w ${mandir1}/whatis ] ++ then ++ if [ x$verbose != x ]; then ++ echo skipping $mandir - whatis file is readonly > /dev/stderr ++ fi ++ continue ++ elif [ ! -e ${mandir1}/whatis ] && [ ! -w ${mandir1} ] ++ then ++ if [ x$verbose != x ]; then ++ echo skipping $mandir - directory is readonly > /dev/stderr ++ fi ++ continue ++ fi ++ fi ++ + if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then + if [ x$verbose != x ]; then + echo skipping $mandir - we did it already > /dev/stderr +@@ -407,14 +439,6 @@ + + cd $here + +- # kludge for Slackware's /usr/man/preformat +- if [ $mandir = /usr/man/preformat ] +- then +- mandir1=/usr/man +- else +- mandir1=$mandir +- fi +- + if [ -f ${mandir1}/whatis ] + then + cat ${mandir1}/whatis >> $TMPFILE diff --git a/sys-apps/man/files/man-1.6e-readonly-whatis2.patch b/sys-apps/man/files/man-1.6e-readonly-whatis2.patch new file mode 100644 index 000000000000..92e37d0df159 --- /dev/null +++ b/sys-apps/man/files/man-1.6e-readonly-whatis2.patch @@ -0,0 +1,47 @@ +Dont update makewhatis files if they're on readonly filesystems + +http://bugs.gentoo.org/163932 + +--- src/makewhatis.sh ++++ src/makewhatis.sh +@@ -184,6 +188,25 @@ + if [ x$verbose != x ]; then + echo "about to enter $mandir" > /dev/stderr + fi ++ ++ # kludge for Slackware's /usr/man/preformat ++ if [ $mandir = /usr/man/preformat ] ++ then ++ mandir1=/usr/man ++ else ++ mandir1=$mandir ++ fi ++ ++ # if $mandir is on a readonly partition and we cannot update the whatis ++ # file, then let's simply skip it ++ if ! touch ${mandir1}/whatis 2> /dev/null ++ then ++ if [ x$verbose != x ]; then ++ echo skipping $mandir - whatis file is readonly > /dev/stderr ++ fi ++ continue ++ fi ++ + if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then + if [ x$verbose != x ]; then + echo skipping $mandir - we did it already > /dev/stderr +@@ -407,14 +430,6 @@ + + cd $here + +- # kludge for Slackware's /usr/man/preformat +- if [ $mandir = /usr/man/preformat ] +- then +- mandir1=/usr/man +- else +- mandir1=$mandir +- fi +- + if [ -f ${mandir1}/whatis ] + then + cat ${mandir1}/whatis >> $TMPFILE |