From owner-svn-ports-all@freebsd.org Sun Dec 13 01:44:52 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9799A1462C; Sun, 13 Dec 2015 01:44:52 +0000 (UTC) (envelope-from jason.unovitch@gmail.com) Received: from mail-qg0-x22b.google.com (mail-qg0-x22b.google.com [IPv6:2607:f8b0:400d:c04::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7BBF21443; Sun, 13 Dec 2015 01:44:52 +0000 (UTC) (envelope-from jason.unovitch@gmail.com) Received: by qgew101 with SMTP id w101so22823942qge.2; Sat, 12 Dec 2015 17:44:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:user-agent:in-reply-to:references:mime-version :content-transfer-encoding:content-type:subject:reply-to:date:to:cc :message-id; bh=fNca9wO0d/CjczBLpuDY7iy8Ky/Ux68nhf0ZjVS5jNA=; b=KKCFTg2hukDgFiUino+UjJ/ZGX4qMYPLYp8jOZqA/3lMxQLGS0uWO5TrSeq+njuvyl hhjUSkmAsBLur7xdfWmvTniruKl1ID/rVImjZ7bpejn3G96p4ycKIF358DyEoF0MDtoV 6LVNOPWS+Fyam6NzjD76s81mYa7wDu/34hLEG7WUZGzTPox3ZQWFk0K/XNc3vBfekAAd chdMYXpZ+Jt7fgEwI0ONJa6tX9Uoqjsrni3/a+Es6qkzf/TUo5Xs7vrV9JWmJPxtl93h d0aLbQNxy9P9RGvdYBJczZu9wL9xIXrnAtQOUAUd4ioPwbWbgfiuPxCvxXF1QIUUhrMn RLlg== X-Received: by 10.140.109.247 with SMTP id l110mr33221943qgf.35.1449971091422; Sat, 12 Dec 2015 17:44:51 -0800 (PST) Received: from android-18788fb5f991b5a.nc-us.unovitch.com (cpe-98-24-222-249.nc.res.rr.com. [98.24.222.249]) by smtp.gmail.com with ESMTPSA id m107sm1424254qgm.19.2015.12.12.17.44.50 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 12 Dec 2015 17:44:50 -0800 (PST) From: Jason Unovitch X-Google-Original-From: Jason Unovitch User-Agent: K-9 Mail for Android In-Reply-To: References: <201512120313.tBC3DNQf013915@repo.freebsd.org> <20151212124157.GB46628@Silverstone.nc-us.unovitch.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Subject: Re: svn commit: r403581 - branches/2015Q4/sysutils/py-salt Reply-to: junovitch@FreeBSD.org Date: Sat, 12 Dec 2015 20:44:38 -0500 To: Dryice Liu CC: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Message-ID: <23438DAC-7CC7-4CA4-A862-5F8CA0DB2F2F@FreeBSD.org> X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Dec 2015 01:44:52 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On December 12, 2015 9:41:54 AM EST, Dryice Liu wrote: >Jason Unovitch 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 >(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-----