From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 9 Jan 2012 03:39:10 +0000 (+0000)
Subject: better about when to update fonts.dir
X-Git-Tag: debian/1.2~34
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=xfonts-traditional.git;a=commitdiff_plain;h=7f092ad2dd37b319591107ab6a3086d0d3a6e800

better about when to update fonts.dir
---

diff --git a/update-xfonts-traditional b/update-xfonts-traditional
index d34157f..eb11b0f 100755
--- a/update-xfonts-traditional
+++ b/update-xfonts-traditional
@@ -282,13 +282,18 @@ sub processfontdir ($) {
 	}
 	unlink "$fontdir/$olddent" or die "$fontdir $olddent $!";
 	$changed = 1;
+	$updated++;
+    }
+    if (!stat "$fontdir/fonts.dir") {
+	$!==&ENOENT or die "$fontdir $!";
+    } else {
+	$!=0; $?=0; system 'mkfontdir',$fontdir;
+	die "$fontdir $? $!" if $? or $!;
     }
     if (!$anypcfs) {
 	unlink "$fontdir/$logfile" or die "$fontdir $!";
 	unlink "$fontdir/$donefile" or $!==&ENOENT or die "$fontdir $!";
     } elsif ($changed) {
-	$!=0; $?=0; system 'mkfontdir',$fontdir;
-	die "$fontdir $? $!" if $? or $!;
 	my $newdoneh = new IO::File "$fontdir/$donefile.new", 'w' 
 	    or die "$fontdir $!";
 	print $newdoneh Dumper($newdone) or die "$fontdir $!";