X Strike Force X.Org X11 SVN commit: r4207 - trunk/debian/xorg/debian/local
Author: julien
Date: 2007-01-14 19:44:56 -0500 (Sun, 14 Jan 2007)
New Revision: 4207
Modified:
trunk/debian/xorg/debian/local/dexconf
Log:
Make dexconf cope with a nonexistent shared/fontpath/fontserver template.
If x11-common is installed with an older xserver-xorg, the new fontserver
template will not exist, and db_get will fail. Since dexconf is set -e,
we need to add a test around db_get to deal with this case.
Modified: trunk/debian/xorg/debian/local/dexconf
===================================================================
--- trunk/debian/xorg/debian/local/dexconf 2007-01-15 00:17:14 UTC (rev 4206)
+++ trunk/debian/xorg/debian/local/dexconf 2007-01-15 00:44:56 UTC (rev 4207)
@@ -200,11 +200,11 @@
fetch xserver-$SERVER/config/write_files_section
if [ "$RET" = "true" ]; then
- db_get shared/fontpath/fontserver
- if [ -n "$RET" ] ; then
- FONTSERVER="$RET"
- else
- FONTSERVER=""
+ FONTSERVER=""
+ if db_get shared/fontpath/fontserver; then
+ if [ -n "$RET" ] ; then
+ FONTSERVER="$RET"
+ fi
fi
exec 4>"$DEXCONFTMPDIR/Files"
cat >&4 <<SECTION
Reply to: