Merge pull request #1374 from justinstoller/metadata_loading_robustness

(PE-34196, PE-34917) Make loading metadata in `--incremental` deploys more robust
puppetlabs · Mar 20, 2024 · e5be03b · e5be03b
2 parents d623be1 + 78ff934
commit e5be03b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.mkd b/CHANGELOG.mkd
@@ -3,6 +3,7 @@ CHANGELOG
 
 Unreleased
 ----------
+- Make metadata loading during incremental deploys more robust [PE-34917](https://perforce.atlassian.net/browse/PE-34917)
 
 
 3.16.0

diff --git a/lib/r10k/module_loader/puppetfile.rb b/lib/r10k/module_loader/puppetfile.rb
@@ -104,8 +104,11 @@ def load_metadata!
         @existing_module_versions_by_name = @existing_module_metadata.map {|mod| [ mod.name, mod.version ] }.to_h
         empty_load_output.merge(modules: @existing_module_metadata)
 
-      rescue SyntaxError, LoadError, ArgumentError, NameError => e
+      rescue ScriptError, StandardError => e
         logger.warn _("Unable to preload Puppetfile because of %{msg}" % { msg: e.message })
+
+        @existing_module_metadata = []
+        @existing_module_versions_by_name = {}
       end
 
       def add_module_metadata(name, info)
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ CHANGELOG @@
     Unreleased
     ----------
+    - Make metadata loading during incremental deploys more robust [PE-34917](https://perforce.atlassian.net/browse/PE-34917)
 .16.0
@@ Expand Down @@