Reviewed-by: Daniel Pittman <dan...@puppetlabs.com>
Signed-off-by: Matt Robinson <m...@puppetlabs.com>
---
Local-branch: ticket/next/6830-more_ruby19_fixes
lib/puppet/parser/functions/sha1.rb | 2 +-
lib/puppet/transaction.rb | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/puppet/parser/functions/sha1.rb
b/lib/puppet/parser/functions/sha1.rb
index 10cc55c..1e7d5ab 100644
--- a/lib/puppet/parser/functions/sha1.rb
+++ b/lib/puppet/parser/functions/sha1.rb
@@ -1,5 +1,5 @@
Puppet::Parser::Functions::newfunction(:sha1, :type => :rvalue, :doc =>
"Returns a SHA1 hash value from a provided string.") do |args|
- require 'sha1'
+ require 'digest/sha1'
Digest::SHA1.hexdigest(args[0])
end
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 0533273..d7845fb 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -4,7 +4,7 @@
require 'puppet'
require 'puppet/util/tagging'
require 'puppet/application'
-require 'sha1'
+require 'digest/sha1'
class Puppet::Transaction
require 'puppet/transaction/event'
@@ -255,13 +255,13 @@ class Puppet::Transaction
# We want to monitor changes in the relationship graph of our
# catalog but this is complicated by the fact that the catalog
- # both is_a graph and has_a graph, by the fact that changes to
+ # both is_a graph and has_a graph, by the fact that changes to
# the structure of the object can have adverse serialization
# effects, by threading issues, by order-of-initialization issues,
- # etc.
+ # etc.
#
# Since the proper lifetime/scope of the monitoring is a transaction
- # and the transaction is already commiting a mild law-of-demeter
+ # and the transaction is already commiting a mild law-of-demeter
# transgression, we cut the Gordian knot here by simply wrapping the
# transaction's view of the resource graph to capture and maintain
# the information we need. Nothing outside the transaction needs
--
1.7.3.1
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to
puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
