[Pkg-puppet-devel] [facter] 297/352: (maint) Simplify aggregate error message

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit 680f32e1b159f861d292eb901498cfaa4dc6938f
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Thu Feb 27 15:21:46 2014 -0800

    (maint) Simplify aggregate error message
---
 lib/facter/core/aggregate.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/facter/core/aggregate.rb b/lib/facter/core/aggregate.rb
index 619bf1c..775171a 100644
--- a/lib/facter/core/aggregate.rb
+++ b/lib/facter/core/aggregate.rb
@@ -196,9 +196,9 @@ class Facter::Core::Aggregate
       Facter::Util::Values.deep_merge(result, current)
     end
   rescue Facter::Util::Values::DeepMergeError => e
-    raise ArgumentError, "No aggregate block specified and could not deep merge" +
-      " all chunks, either specify an aggregate block or ensure that all chunks" +
-      " return deep mergable structures. (Original error: #{e.message})", e.backtrace
+    raise ArgumentError, "Could not deep merge all chunks (Original error: " +
+      "#{e.message}), ensure that chunks return either an Array or Hash or " +
+      "override the aggregate block", e.backtrace
   end
 
   # Order chunks based on their dependencies

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git