Date: Sat, 12 Dec 2015 20:44:38 -0500 From: Jason Unovitch <jason.unovitch@gmail.com> To: Dryice Liu <dryice@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r403581 - branches/2015Q4/sysutils/py-salt Message-ID: <23438DAC-7CC7-4CA4-A862-5F8CA0DB2F2F@FreeBSD.org> In-Reply-To: <m26103d8zx.fsf@freebsd.org> References: <201512120313.tBC3DNQf013915@repo.freebsd.org> <20151212124157.GB46628@Silverstone.nc-us.unovitch.com> <m26103d8zx.fsf@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On December 12, 2015 9:41:54 AM EST, Dryice Liu <dryice@freebsd.org> wrote: >Jason Unovitch <junovitch@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@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 Don't worry about it. Think "learning opportunity" instead of "mistake". It was an easy fix and certainly one that shows why we all review each others work. -----BEGIN PGP SIGNATURE----- iQFHBAEBCgAxKhxKYXNvbiBVbm92aXRjaCA8amFzb24udW5vdml0Y2hAZ21haWwu Y29tPgUCVmzNaQAKCRBv1JwwFhyqbuyPB/9moLK6Q3HZb82XDZOXvZTGvfs1N5v/ 6HiwLrcUkFlVvUIW8H09mgXKLqrBQKSIu01kC5TbmbTNrz8KIq/h4IZR8ORylWti KRu8gIxStJbe14UKN1mZTPmFQPWcxzDTDmQIQ3Qg/8s0m+xt6yppRJHePHa+0dyg EtoDs2KLCMESh+eSkHR/s8zJd5iyOuOHrpYN0Hwuw4YH4LuZVRoiLWQMRcPyBdlW gw4TGCBtcBy6xQ5Godb4BgbL16pPxsb+ZBzl/veezau32zRJcVn4++6VS0nCOU2v KaRemy6XOJcSA9vLQHD0lS6/LKDhIknW/9y7gU9albk8KrYLmbI6LIPi =PCwp -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?23438DAC-7CC7-4CA4-A862-5F8CA0DB2F2F>