projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update stdlib
[mirror/dsa-puppet.git]
/
3rdparty
/
modules
/
stdlib
/
lib
/
facter
/
facter_dot_d.rb
diff --git
a/3rdparty/modules/stdlib/lib/facter/facter_dot_d.rb
b/3rdparty/modules/stdlib/lib/facter/facter_dot_d.rb
index
b058437
..
5c5fb1f
100644
(file)
--- a/
3rdparty/modules/stdlib/lib/facter/facter_dot_d.rb
+++ b/
3rdparty/modules/stdlib/lib/facter/facter_dot_d.rb
@@
-8,7
+8,7
@@
# contains a cache TTL. For foo.sh store the ttl as just
# a number in foo.sh.ttl
#
# contains a cache TTL. For foo.sh store the ttl as just
# a number in foo.sh.ttl
#
-# The cache is stored in
/tmp/facts_cache.yaml
as a mode
+# The cache is stored in
$libdir/facts_dot_d.cache
as a mode
# 600 file and will have the end result of not calling your
# fact scripts more often than is needed
# 600 file and will have the end result of not calling your
# fact scripts more often than is needed
@@
-48,7
+48,7
@@
class Facter::Util::DotD
end
end
end
end
end
end
- rescue
Exception
=> e
+ rescue
StandardError
=> e
Facter.warn("Failed to handle #{file} as text facts: #{e.class}: #{e}")
end
Facter.warn("Failed to handle #{file} as text facts: #{e.class}: #{e}")
end
@@
-65,7
+65,7
@@
class Facter::Util::DotD
setcode { v }
end
end
setcode { v }
end
end
- rescue
Exception
=> e
+ rescue
StandardError
=> e
Facter.warn("Failed to handle #{file} as json facts: #{e.class}: #{e}")
end
Facter.warn("Failed to handle #{file} as json facts: #{e.class}: #{e}")
end
@@
-77,7
+77,7
@@
class Facter::Util::DotD
setcode { v }
end
end
setcode { v }
end
end
- rescue
Exception
=> e
+ rescue
StandardError
=> e
Facter.warn("Failed to handle #{file} as yaml facts: #{e.class}: #{e}")
end
Facter.warn("Failed to handle #{file} as yaml facts: #{e.class}: #{e}")
end
@@
-106,7
+106,7
@@
class Facter::Util::DotD
end
end
end
end
end
end
- rescue
Exception
=> e
+ rescue
StandardError
=> e
Facter.warn("Failed to handle #{file} as script facts: #{e.class}: #{e}")
Facter.debug(e.backtrace.join("\n\t"))
end
Facter.warn("Failed to handle #{file} as script facts: #{e.class}: #{e}")
Facter.debug(e.backtrace.join("\n\t"))
end