sq: When merging keyrings, produce output in a reproducible order

The output keyring now has keys in fingerprint order.

Closes #762

1 files changed, 7 insertions, 2 deletions

diff --git a/sq/src/commands/keyring.rs b/sq/src/commands/keyring.rs
index 81fce15e..fc3d867a 100644
--- a/sq/src/commands/keyring.rs
+++ b/sq/src/commands/keyring.rs
@@ -371,8 +371,13 @@ fn merge(inputs: Option<clap::Values>, output: &mut dyn io::Write)
         }
     }
 
-    for (_, cert) in certs.iter_mut() {
-        cert.take().unwrap().as_tsk().serialize(output)?;
+    let mut fingerprints: Vec<Fingerprint> = certs.keys().cloned().collect();
+    fingerprints.sort();
+
+    for fpr in fingerprints.iter() {
+        if let Some(Some(cert)) = certs.get(fpr) {
+            cert.as_tsk().serialize(output)?;
+        }
     }
 
     Ok(())