Merge pull request #4804 from ccaviness/fix/3.x/plist_line_continuation

(PUP-6073) Handle launchd plists with line continuations
puppetlabs · Mar 22, 2016 · abf3649 · abf3649
2 parents eca6be0 + 26a9881
commit abf3649
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/puppet/provider/service/launchd.rb b/lib/puppet/provider/service/launchd.rb
@@ -206,7 +206,7 @@ def has_macosx_plist_overrides?
   def self.read_plist(path)
     begin
       return Plist::parse_xml(path)
-    rescue ArgumentError => detail
+    rescue ArgumentError, NoMethodError => detail
       Puppet.debug("Error reading #{path}: #{detail}. Retrying with plutil.")
     end