chiark / gitweb /
layout/data2safety: use new $desc variable for error reporting - no serious functiona...
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 12 Dec 2010 02:07:14 +0000 (02:07 +0000)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 12 Dec 2010 02:07:14 +0000 (02:07 +0000)
layout/data2safety

index 31f0b14aea910413ceb6054857282a4e24b569b2..4e29d12c64a917177a57b0c1f3e65281ef30219b 100755 (executable)
@@ -340,7 +340,7 @@ sub line_endwiring () {
        $featr= $segr->{Feats}{$feat};
        if (exists $featr->{Fixed}) {
            if ($pos != $featr->{Fixed}) {
-               ditch("fixed-elsewise $seg/$subspec");
+               ditch("fixed-elsewise $desc");
                return;
            }
        } else {
@@ -353,11 +353,11 @@ sub line_endwiring () {
     for $feat (keys %{ $segr->{Feats} }) {
        $featr= $segr->{Feats}{$feat};
        next if exists $featr->{Fixed};
-       mistake("wiring $seg/$feat not covered by $seg/$subspec"),next
+       mistake("wiring $seg/$feat not covered by $desc"),next
            if !exists $featposwant{$feat};
        $combpos += $featposwant{$feat} * $featr->{Weight};
     }
-    mistake("duplicate topology subseg for $seg/$subspec")
+    mistake("duplicate topology subseg for $desc")
        if defined $segs{$seg}{Dist}[$combpos];
     $segs{$seg}{Dist}[$combpos]= $dist;
     $endposr= $segr->{Ends}[$combpos];