From 48dafae913459780cb081c8c31191ecbaf6b26f0 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed, 3 Jan 2024 18:25:08 +0000
Subject: Avoid an exception if package.merge() fails and returns None

---
 calm/calm.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/calm/calm.py b/calm/calm.py
index e092468..c0926e0 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -343,6 +343,11 @@ def _process_maintainer_uploads(scan_result, args, state, all_packages, m, based
         # remove files which are to be removed
         scan_result[arch].to_vault.map(lambda p, f: package.delete(merged_packages[arch], p, f))
 
+    # if an error occurred ...
+    if not valid:
+        # ... discard move list and merged_packages
+        return False
+
     # validate the package set
     state.valid_provides = db.update_package_names(args, merged_packages)
     for arch in common_constants.ARCHES:
-- 
cgit v1.2.3