Re: [Puppet-dev] #18393 - diff args

2013-05-15 Thread Alex Harvey
On Thursday, May 16, 2013 3:31:09 AM UTC+10, Jeff Weiss wrote: > > > The pull request that Andy mentioned and that Chris merged is to provide > an adequate default diffargs on all of our commercially supported > platforms. Diff is off by default. If one goes into puppet.conf to enable > diff,

Re: [Puppet-dev] #18393 - diff args

2013-05-15 Thread Jeff Weiss
On Tue, May 14, 2013 at 9:30 PM, Alex Harvey wrote: > > That said, I think being able to configure the diff_args in puppet.conf is > also an adequate solution. > > As you noted diffargs is already configurable in puppet.conf. The pull request that Andy mentioned and that Chris merged is to provi

Re: [Puppet-dev] #18393 - diff args

2013-05-15 Thread Chris Price
Andy, Sorry, for some reason when I was reviewing that pull request I was thinking it was targeted at our AIX branch. I probably should have checked with your team before merging it. If you guys decide that we should back that out and solve the problem a different way, we will be happy to work wi

Re: [Puppet-dev] #18393 - diff args

2013-05-15 Thread Andy Parker
On Tue, May 14, 2013 at 9:30 PM, Alex Harvey wrote: > > > On Wednesday, May 15, 2013 4:54:33 AM UTC+10, Andy Parker wrote: >> >> It looks like the PE team hit this problem for AIX and created a fix >> where they change the default diff_args based on the platform: >> https://github.com/puppetlabs/p

Re: [Puppet-dev] #18393 - diff args

2013-05-14 Thread Alex Harvey
On Wednesday, May 15, 2013 4:54:33 AM UTC+10, Andy Parker wrote: > > It looks like the PE team hit this problem for AIX and created a fix > where they change the default diff_args based on the platform: > https://github.com/puppetlabs/puppet/pull/1637 > > So it looks like puppet is going to tr

Re: [Puppet-dev] #18393 - diff args

2013-05-14 Thread Andy Parker
It looks like the PE team hit this problem for AIX and created a fix where they change the default diff_args based on the platform: https://github.com/puppetlabs/puppet/pull/1637 So it looks like puppet is going to try and be smart by default. On Fri, May 3, 2013 at 10:32 PM, Alex Harvey wrote:

Re: [Puppet-dev] #18393 - diff args

2013-05-03 Thread Alex Harvey
On Saturday, May 4, 2013 6:20:11 AM UTC+10, Dustin J. Mitchell wrote: > > Nan, you're right - I remember looking at this a while ago, so perhaps > it was in some old version. > Yes, agreed - and documented here, http://docs.puppetlabs.com/references/latest/configuration.html#diffargs Tested

Re: [Puppet-dev] #18393 - diff args

2013-05-03 Thread Dustin J. Mitchell
Nan, you're right - I remember looking at this a while ago, so perhaps it was in some old version. Dustin -- 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 p

Re: [Puppet-dev] #18393 - diff args

2013-05-03 Thread Nan Liu
On Fri, May 3, 2013 at 11:05 AM, Andy Parker wrote: > On Thu, May 2, 2013 at 6:59 PM, Dustin J. Mitchell wrote: > >> On Thu, May 2, 2013 at 9:46 PM, Alex Harvey >> 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

Re: [Puppet-dev] #18393 - diff args

2013-05-03 Thread Daniel Pittman
On Fri, May 3, 2013 at 11:05 AM, Andy Parker wrote: > On Thu, May 2, 2013 at 6:59 PM, Dustin J. Mitchell > wrote: >> >> 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 '

Re: [Puppet-dev] #18393 - diff args

2013-05-03 Thread Andy Parker
On Thu, May 2, 2013 at 6:59 PM, Dustin J. Mitchell wrote: > On Thu, May 2, 2013 at 9:46 PM, Alex Harvey 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 su

Re: [Puppet-dev] #18393 - diff args

2013-05-02 Thread Dustin J. Mitchell
On Thu, May 2, 2013 at 9:46 PM, Alex Harvey 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 configurati

[Puppet-dev] #18393 - diff args

2013-05-02 Thread Alex Harvey
Hi all, 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 li