/[pkgs]/rpms/man/devel/man-1.6f-makewhatis_whis.patch
ViewVC logotype

Contents of /rpms/man/devel/man-1.6f-makewhatis_whis.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Thu Feb 12 13:58:56 2009 UTC (9 months, 1 week ago) by varekova
Branch: MAIN
CVS Tags: F-12-split, man-1_6f-21_fc12, man-1_6f-19_fc12, F-11-split, man-1_6f-18_fc12, man-1_6f-22_fc12, man-1_6f-20_fc12, man-1_6f-16_fc11, man-1_6f-17_fc11, man-1_6f-23_fc13, HEAD
File MIME type: text/x-patch
- Resolves: #481650
  makewhat fails if /usr is read-only
1 diff -up man-1.6f/src/makewhatis.sh.whispath man-1.6f/src/makewhatis.sh
2 --- man-1.6f/src/makewhatis.sh.whispath 2009-02-12 14:22:51.000000000 +0100
3 +++ man-1.6f/src/makewhatis.sh 2009-02-12 14:28:19.000000000 +0100
4 @@ -62,7 +62,8 @@ done
5 DEFCATPATH=$dc
6
7 # make a single big /var/cache/man/whatis file,
8 -DEFWHATIS=/var/cache/man/whatis
9 +DEFWHATISDIR=/var/cache/man
10 +DEFWHATIS=$DEFWHATISDIR/whatis
11
12 AWK=@awk@
13
14 @@ -183,20 +184,20 @@ do
15 mandir1=$mandir
16 fi
17
18 - # if $mandir is on a readonly partition, and the whatis file
19 + # if $DEFWHATISDIR is on a readonly partition, and the whatis file
20 # is not a symlink, then let's skip trying to update it
21 - if [ ! -L ${mandir1}/whatis ]
22 + if [ ! -L $DEFWHATIS ]
23 then
24 - if [ -e ${mandir1}/whatis ] && [ ! -w ${mandir1}/whatis ]
25 + if [ -e $DEFWHATIS ] && [ ! -w $DEFWHATIS ]
26 then
27 if [ x$verbose != x ]; then
28 - echo skipping $mandir - whatis file is readonly > /dev/stderr
29 + echo skipping $DEFWHATISDIR - whatis file is readonly > /dev/stderr
30 fi
31 continue
32 - elif [ ! -e ${mandir1}/whatis ] && [ ! -w ${mandir1} ]
33 + elif [ ! -e $DEFWHATIS ] && [ ! -w $DEFWHATISDIR ]
34 then
35 if [ x$verbose != x ]; then
36 - echo skipping $mandir - directory is readonly > /dev/stderr
37 + echo skipping $DEFWHATISDIR - directory is readonly > /dev/stderr
38 fi
39 continue
40 fi

admin@fedoraproject.org
ViewVC Help
Powered by ViewVC 1.1.2