[BUG] Difference bridge does not patch

Michael Allan mike at zelea.com
Thu Oct 25 02:40:01 EDT 2012


Thanks for fixing this, C.

> What it is bracket style?

I mean what you typed vs. the style in the rest of the file:

    pB.directory(patchFile.getParentFile());

    pB.directory( patchFile.getParentFile() );

M


conseo said:
> Hey Mike,
> 
> patch adjusted, merged and committed. 
> 
> > I agree with the basic fix, which is just this line:
> > 
> > +                    pB.directory(patchFile.getParentFile());
> Yes.
> 
> > 
> > But please (!) use bracket style to match rest of file. :-)
> What it is bracket style?
> 
> > 
> > > Ok, I have patched WP_D to report the stderr result of the patch
> > > command in the exception. ...
> > 
> > Except we still need stderr redirected to outB.  That's why I went
> > through BASH.
> > 
> >    "patch's exit status is 0 if all hunks are applied successfully, 1
> >    if some hunks cannot be applied or there were merge conflicts, and
> >    2 if there is more serious trouble."  patch(1)
> > 
> > Usually it fails normally (1) and the stderr message goes to outB for
> > the user to read.  In your case (2), it instead throws an exception.
> > So maybe append outB.toString() to the exception?  Does that work?
> Yes, done.
> 
> > 
> > And maybe comment the exitValue block with the manpage quote above?
> Done.
> 
> > 
> > Mike
> > 
> > PS, don't forget to add your name to the copyright when making
> > troublesome fixes like this.  Please follow this format:
> > http://zelea.com/project/votorola/contributors.xht#acknowledgment
> Ok, added :-).
> 
> > 
> > PPS, your patch attached as binary and was difficult to read.
> Ok, attatched it from sftp server location, seems it has missed the mimetype.
> 
> conseo



More information about the Votorola mailing list