From 30137b22fae01ef393d897dadece23b564b3d87a Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 15 May 2022 16:57:21 +0100
Subject: [PATCH] shapelib subst: Reorder overrides

This is a bit confusing.  Early settings take precedence since they
get substituted away!

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 src/shapelib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/shapelib.rs b/src/shapelib.rs
index d68923a1..7de6d813 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -1444,9 +1444,9 @@ fn process_files_entry(
       let spec = substn(spec, "${image}", &image_table)?;
       let mut spec = c_colour_all(spec.into())?.is_y()?;
       for (k,v) in chain!{
-        fe.extra_fields.iter().filter(|(k,_v)| k.starts_with('x')),
-        &magic.substs,
         c_substs.into_iter().map(IntoIterator::into_iter).flatten(),
+        &magic.substs,
+        fe.extra_fields.iter().filter(|(k,_v)| k.starts_with('x')),
       } {
         spec = substn(spec, format!("${{{}}}", k), v)?;
       }
-- 
2.30.2