X Strike Force SVN commit: rev 99 - in trunk: . local
Author: branden
Date: 2003-05-29 11:26:28 -0500 (Thu, 29 May 2003)
New Revision: 99
Modified:
trunk/changelog
trunk/local/update-fonts-scale
Log:
only write fonts to the .scale file that actually exist, so that
removed-but-not-purged scalable font packages do not register nonexistent
fonts; this has the desirable side effect that the count at the top of the
file is also omitted (based on a patch by Roland Rosenfeld) (Closes:
#193185)
Modified: trunk/local/update-fonts-scale
==============================================================================
--- trunk/local/update-fonts-scale 2003-05-29 16:04:24 UTC (rev 98)
+++ trunk/local/update-fonts-scale 2003-05-29 16:26:28 UTC (rev 99)
@@ -55,8 +55,17 @@
# are there any files to process?
if [ "$(echo $ETCDIR/*.scale)" != "$ETCDIR/*.scale" ]; then
for file in $ETCDIR/*.scale; do
- # omit count at top of file
- tail -n +2 $file >> $XDIR/fonts.scale.update-tmp
+ # only write fonts to the .scale file that actually exist, so that
+ # removed-but-not-purged scalable font packages do not register
+ # nonexistent fonts; this has the desirable side effect that the count
+ # at the top of the file is also omitted
+ # XXX: this technique will be tricked into yielding false negatives if
+ # the font filename has whitespace in it
+ while read FILENAME FONTNAME; do
+ if [ -f "$XDIR/$FILENAME" ]; then
+ echo "$FILENAME $FONTNAME" >> $XDIR/fonts.scale.update-tmp
+ fi
+ done < $file
done
# write new scale file in case we are interrupted
# write new count to top of file
Modified: trunk/changelog
==============================================================================
--- trunk/changelog 2003-05-29 16:04:24 UTC (rev 98)
+++ trunk/changelog 2003-05-29 16:26:28 UTC (rev 99)
@@ -129,6 +129,11 @@
give authorization errors even when they are running as the same user
and on the same machine as the X server?"
* debian/local/XFree86-FAQ.html: deleted; see above
+ * debian/local/update-fonts-scale: only write fonts to the .scale file that
+ actually exist, so that removed-but-not-purged scalable font packages do
+ not register nonexistent fonts; this has the desirable side effect that
+ the count at the top of the file is also omitted (based on a patch by
+ Roland Rosenfeld) (Closes: #193185)
* debian/local/xterm.faq.html: updated from revision 1.75 to 1.77
* debian/po/ca.po: updated Catalan debconf template translations (thanks,
Ivan Vilata i Balaguer) (Closes: #183317,#183322)
@@ -199,7 +204,7 @@
xserver-xfree86/config/device/driver from "atimisc", "r128", or "radeon"
to "ati"
- -- Branden Robinson <branden@debian.org> Thu, 29 May 2003 11:03:40 -0500
+ -- Branden Robinson <branden@debian.org> Thu, 29 May 2003 11:24:29 -0500
xfree86 (4.2.1-6) unstable; urgency=medium
Reply to: