svn commit: r403581 - branches/2015Q4/sysutils/py-salt

[Dryice Liu]

Jason Unovitch <junovitch at FreeBSD.org> wrote:

> On Sat, Dec 12, 2015 at 03:13:23AM +0000, Dryice Dong Liu wrote:
>> Author: dryice
>> Date: Sat Dec 12 03:13:23 2015
>> New Revision: 403581
>> URL: https://svnweb.freebsd.org/changeset/ports/403581
>> 
>> Log:
>>   MFH: r403109
>>   
>>   Update to 2015.8.3
>>   
>>   PR:		205043
>>   Submitted by: Christer Edwards <christer.edwards at gmail.com> (maintainer)
>>   Approved by:	portmgr (feld)
>
> Please keep in mind the implied SVN task here... neither SVN nor
> Tools/scripts/mfh will tell you if prior commits are actually needed to
> build.  Here the port is failing to build after this with the following
> error since the prior commits were required.
>
> ===>  Patching for py27-salt-2015.8.3
> ===>  Applying FreeBSD patches for py27-salt-2015.8.3
> Ignoring previously applied (or reversed) patch.
> 4 out of 4 hunks ignored--saving rejects to salt/utils/__init__.py.rej
> => Patch patch-salt__utils____init__.py failed to apply cleanly.
> => Patch(es) patch-salt__grains__core.py applied cleanly.
> *** [do-patch] Error code 1

You are right. This is my mistake. Thanks for fixing it.


Dryice