On Fri, May 3, 2013 at 11:05 AM, Andy Parker <[email protected]> wrote:
> On Thu, May 2, 2013 at 6:59 PM, Dustin J. Mitchell <[email protected]>wrote: > >> On Thu, May 2, 2013 at 9:46 PM, Alex Harvey <[email protected]> >> wrote: >> > I need to submit a patch to fix #18393 as it is affecting about half my >> > fleet - turns out AIX<=5.3, Solaris<=8, and all HP-UX don't have a diff >> with >> > -u. I would like to submit a patch that allows us to specify diff args >> in >> > the configuration file that override the defaults. I'd just like to >> check >> > in with everyone first that there are no in principle objections to >> what I'm >> > doing. >> >> > No principle objection > > >> The way 'diff' is hardcoded into the source is a little janky. It'd >> be nice to allow that to be fully customized, rather than just >> accepting args to add to a hard-coded 'diff'. >> >> > I do, however, agree with Dustin. The first time I found the diff call it > was a bit of a WTF moment. I would be for either making the entire diff > call configurable or replace the call to an external prog with a ruby diff > implementation. > > If we change the call (such as dropping -u in certain cases) could this > cause any problems? Are there any systems that are using that diff output > for anything? Or is this just a thing that humans read? > I can understand if it's a request to change the default setting, but isn't this already configurable? for both the diff tool and diff args? [main] diff='' diff_args = '' $ puppet apply ~/tmp/file.pp --show_diff --diff='ls' --diff_arg='-l' notice: /Stage[main]//File[/tmp/a]/content: -rw-r--r-- 1 nan wheel 9 May 3 15:09 /tmp/a -rw------- 1 nan staff 5 May 3 15:09 /var/folders/6j/mpcsjgt17n30_lc8bk9_b93r0000gn/T/puppet-file20130503-55060-mngkym Nan -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/puppet-dev?hl=en. For more options, visit https://groups.google.com/groups/opt_out.
