From owner-svn-ports-all@freebsd.org Thu Feb 15 08:35:53 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B535F07BC5; Thu, 15 Feb 2018 08:35:53 +0000 (UTC) (envelope-from mat@atuin.in.mat.cc) Received: from prod2.absolight.net (prod2.absolight.net [79.143.243.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "plouf.absolight.net", Issuer "CAcert Class 3 Root" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 311AD69629; Thu, 15 Feb 2018 08:35:52 +0000 (UTC) (envelope-from mat@atuin.in.mat.cc) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id AC62EBDD2D; Thu, 15 Feb 2018 09:35:51 +0100 (CET) Received: from atuin.in.mat.cc (atuin.in.mat.cc [79.143.241.205]) by prod2.absolight.net (Postfix) with ESMTPA id 6B13ABDD1E; Thu, 15 Feb 2018 09:35:50 +0100 (CET) Received: by atuin.in.mat.cc (Postfix, from userid 501) id 5DEA6A2CE03D; Thu, 15 Feb 2018 09:35:47 +0100 (CET) Date: Thu, 15 Feb 2018 09:35:47 +0100 From: Mathieu Arnold To: Brad Davis Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r461844 - in head: . net-mgmt net-mgmt/prometheus net-mgmt/prometheus1 net-mgmt/prometheus2 net-mgmt/prometheus2/files Message-ID: <20180215083547.zrd2bggrbhnq56y4@atuin.in.mat.cc> References: <201802142158.w1ELwc51053041@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="xkmwrgnhqohjnwha" Content-Disposition: inline In-Reply-To: <201802142158.w1ELwc51053041@repo.freebsd.org> User-Agent: NeoMutt/20170912 (1.9.0) X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 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: Thu, 15 Feb 2018 08:35:53 -0000 --xkmwrgnhqohjnwha Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable There are a few problems with this commit. On Wed, Feb 14, 2018 at 09:58:38PM +0000, Brad Davis wrote: > Log: > Add net-mgmt/prometheus2 > =20 > Rename prometheus to prometheus1 so they can coexist since upgrading is > non-trival: > =20 > https://prometheus.io/docs/prometheus/2.0/migration/ > =20 > PR: 225169 > Submitted by: David O'Rourke > Reviewed by: swills >=20 > Added: > head/net-mgmt/prometheus1/ > - copied from r461843, head/net-mgmt/prometheus/ > head/net-mgmt/prometheus2/ > head/net-mgmt/prometheus2/Makefile (contents, props changed) > head/net-mgmt/prometheus2/distinfo (contents, props changed) > head/net-mgmt/prometheus2/files/ > head/net-mgmt/prometheus2/files/prometheus.in (contents, props change= d) > head/net-mgmt/prometheus2/pkg-descr (contents, props changed) > head/net-mgmt/prometheus2/pkg-message (contents, props changed) > head/net-mgmt/prometheus2/pkg-plist (contents, props changed) So, you did copy prometheus to prometheus1 but forgot to also copy it to prometheus2 in order to preserve history. This will have to be done again properly. > Modified: head/net-mgmt/prometheus1/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/net-mgmt/prometheus/Makefile Wed Feb 14 21:43:30 2018 (r461843) > +++ head/net-mgmt/prometheus1/Makefile Wed Feb 14 21:58:37 2018 (r461844) > @@ -3,9 +3,10 @@ > =20 > PORTNAME=3D prometheus > PORTVERSION=3D 1.8.2 > -PORTREVISION=3D 1 > DISTVERSIONPREFIX=3D v > +PORTREVISION=3D 1 > CATEGORIES=3D net-mgmt > +PKGNAMESUFFIX=3D 1 >=20 You added 1 to the package name, which seems ok, though renaming packages is probably a bad idea because of the wtf moment people using it will have :-) > Added: head/net-mgmt/prometheus2/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/net-mgmt/prometheus2/Makefile Wed Feb 14 21:58:37 2018 (r461844) > @@ -0,0 +1,53 @@ > +# $FreeBSD$ > + > +PORTNAME=3D prometheus > +PORTVERSION=3D 2.1.0 > +DISTVERSIONPREFIX=3D v > +CATEGORIES=3D net-mgmt >=20 But you did not add a 2 to this one, so people who run pkg upgrade will go to 1.8.2 to 2.1.0 and it'll break, as, like you said, upgrading is non trivial. --=20 Mathieu Arnold --xkmwrgnhqohjnwha Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAABCgBmBQJahUZjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85ITnIP/j6QY0a8l/ucwQu/xK8qzOY4 9GmfOa/qam3Yo4MaD4+f5R+xgCtwBNeCZky1fnauWjskekcVJnrw9SVYyGs5Ss2k KthaQHXC7pTwbD7v1WqqVLxskp4zAByGCRIf8C+1pBjCc9YLmt4L76790DmOnka5 UFMeym6hZ9NBZivzGx48+KjAzhglJ3aY+0kj1wyeKNDJVe2jlH2iGGC7PghhqSZm Qjsdf7hPdF3l2jPn5qnsTnYRpT0H2SBOTsMbsA+4aLdexrXxmsNpeBns7XIEaRwe xMAoKv/3JS9sgmNCawiDTztVieDLsXXMIRAMk+EX73xVgppRdqxxqn7Y7aA95cp6 wa57kJrYieOKuHVfjc70KfLK7lhUSLnMyWyrpU7P0SODnYnBT68TuVtNsjE0oFH5 /9rtWtzevfvyv3qCTJFzbfI4L0hxhZdCbxek2qiINEHOLLkh+sE5nNnklb9EJab0 DVPvq6rReEQ43bDVNk7GoEciV3soHRJ6BKvqGKOCiZMhOjoiNVoReYxLgxmCTnp6 KFxGz/5eUfVY+oUU69nSog7FvV8oldoDgE+ap8KkKGejrvosRDvQF2MPDAqd/Dj3 Xw43hrzHmN+aQ4jFqPYPIHtiAwsUuwnLjzMxcAdMqavysR776lZdFTR8byhxqJoe VFDfvcLRSPbDHzYEmmJW =ObG3 -----END PGP SIGNATURE----- --xkmwrgnhqohjnwha--