Jira (PUP-2073) PR (2477) Multiple values for diff_args causes diff execution failure

[Joshua Cooper (JIRA)]

Title: Message Title

Joshua Cooper commented on an issue   Re: PR (2477) Multiple values for diff_args causes diff execution failure To reproduce: $ bundle exec puppet config set show_diff true $ bundle exec puppet config set -- diff_args '-u --strip-trailing-cr' $ bundle exec puppet agent --configprint diff_args -u --strip-trailing-cr Create an empty file: $ touch /tmp/newfile Create a file manifest with some content with newlines, e.g. content => "hello\nworld\n" Apply the manifest with --debug and you should see a diff that ignores newlines: $ bundle exec puppet apply file.pp --debug ... Debug: Executing 'diff -u --strip-trailing-cr /tmp/newfile /var/folders/2q/qhdc5tpx4knd4pjr1hdskmjc0000gn/T/puppet-file20140424-38379-1qwccx0' Notice: /Stage[main]/Main/File[/tmp/newfile]/content: --- /tmp/newfile 2014-04-24 16:15:29.000000000 -0700 +++ /var/folders/2q/qhdc5tpx4knd4pjr1hdskmjc0000gn/T/puppet-file20140424-38379-1qwccx0 2014-04-24 16:15:36.000000000 -0700 @@ -0,0 +1,2 @@ +hello +world Previously, you would see the debug statement that it was executing the diff command, but nothing would actually be printed Add Comment   Puppet / PUP-2073 PR (2477) Multiple values for diff_args causes diff execution failure Inserting multiple switches for diff_args in puppet.conf causes diff execution to fail. I experienced this in both Windows and Linux. Example: diff_args = -u --strip-trailing-cr This commit will fix the problem: https://github.com/mshean/puppet/commit/7972585779f3a12cfe62449df3c5e9d3b96c6136 This message was sent by Atlassian JIRA (v6.1.4#6159-sha1:44eaede) -- You received this message because you are subscribed to the Google Groups "Puppet Bugs" group. To unsubscribe from this group and stop receiving emails from it, send an email to puppet-bugs+unsubscr...@googlegroups.com. To post to this group, send email to puppet-bugs@googlegroups.com. Visit this group at http://groups.google.com/group/puppet-bugs. For more options, visit https://groups.google.com/d/optout.