To be clear: this is just for testing, not to be merged yet. On Sep 15, 2009, at 2:04 PM, Markus Roberts wrote:
> > Ticket #2615 may encompass several issues; this patch only fixes > the misleading error message portion of the ticket. > > Signed-off-by: Markus Roberts <[email protected]> > --- > lib/puppet/type/file/content.rb | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/lib/puppet/type/file/content.rb b/lib/puppet/type/file/ > content.rb > index ff71a55..784bb4d 100755 > --- a/lib/puppet/type/file/content.rb > +++ b/lib/puppet/type/file/content.rb > @@ -39,8 +39,8 @@ module Puppet > # Checksums need to invert how changes are printed. > def change_to_s(currentvalue, newvalue) > # Our "new" checksum value is provided by the source. > - unless source = resource.parameter(:source) and > newvalue = source.checksum > - newvalue = "unknown checksum" > + if source = resource.parameter(:source) > + newvalue = source.checksum || "unknown checksum" > end > if currentvalue == :absent > return "defined content as '%s'" % [newvalue] > -- > 1.6.4 > > > > -- Always be wary of any helpful item that weighs less than its operating manual. -- Terry Pratchett --------------------------------------------------------------------- Luke Kanies | http://reductivelabs.com | http://madstop.com --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en -~----------~----~----~----~------~----~------~--~---
