From owner-svn-ports-all@freebsd.org Thu Feb 15 16:24:49 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 B1028F053E6; Thu, 15 Feb 2018 16:24:49 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5EA5A80783; Thu, 15 Feb 2018 16:24:49 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 6EBFB206DB; Thu, 15 Feb 2018 11:24:48 -0500 (EST) Received: from web6 ([10.202.2.216]) by compute5.internal (MEProxy); Thu, 15 Feb 2018 11:24:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=YfVzte d6gN77thRwWvil/o6MgYm8z3KmNilS31Wu+qU=; b=BUALcjwAVB6KNIs3sfbHEH P+DkQAE82PfD3hiS415h8RQ4GW1WEyc2tsv/vD3KNKReUQCz6sv2VjCWoUYlsyhP WY5jGIElrnRnAh1SOq8Cm+zMsIDjigr7b9xer36rhBSPAzrBiK5LSY/M+70DifaK aMCxr9fIwsfVp5lc3ynLbMZmlDAH55yRe50Wfl8Q0GdZR3GWZTFj8VkcSArhMvJW JKujqq2REkMNlVDoe6542w+s70tPMjLQER6aItf2sHvfu0rqASEZ6cRB1tYpmwcq NoVgWY2cD4+nO9rMBO4mF/+QVN5NEbYgZEOEjIcw6urVXc36m879SVh45QTDu16g == X-ME-Sender: Received: by mailuser.nyi.internal (Postfix, from userid 99) id 4FEF3410D; Thu, 15 Feb 2018 11:24:48 -0500 (EST) Message-Id: <1518711888.992438.1272052384.166A69A9@webmail.messagingengine.com> From: Brad Davis To: Mathieu Arnold Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" X-Mailer: MessagingEngine.com Webmail Interface - ajax-1b99b2df Date: Thu, 15 Feb 2018 09:24:48 -0700 Subject: Re: svn commit: r461844 - in head: . net-mgmt net-mgmt/prometheus net-mgmt/prometheus1 net-mgmt/prometheus2 net-mgmt/prometheus2/files References: <201802142158.w1ELwc51053041@repo.freebsd.org> <20180215083547.zrd2bggrbhnq56y4@atuin.in.mat.cc> In-Reply-To: <20180215083547.zrd2bggrbhnq56y4@atuin.in.mat.cc> 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 16:24:49 -0000 On Thu, Feb 15, 2018, at 1:35 AM, Mathieu Arnold wrote: > 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 > > > > Rename prometheus to prometheus1 so they can coexist since upgrading is > > non-trival: > > > > https://prometheus.io/docs/prometheus/2.0/migration/ > > > > PR: 225169 > > Submitted by: David O'Rourke > > Reviewed by: swills > > > > 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 changed) > > 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. OK, will do. > > Modified: head/net-mgmt/prometheus1/Makefile > > ============================================================================== > > --- 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 @@ > > > > PORTNAME= prometheus > > PORTVERSION= 1.8.2 > > -PORTREVISION= 1 > > DISTVERSIONPREFIX= v > > +PORTREVISION= 1 > > CATEGORIES= net-mgmt > > +PKGNAMESUFFIX= 1 > > > > 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 :-) Yeah, this is part of the explanation below.. Steve and I wondered if pkg uses MOVED at all? > > Added: head/net-mgmt/prometheus2/Makefile > > ============================================================================== > > --- /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= prometheus > > +PORTVERSION= 2.1.0 > > +DISTVERSIONPREFIX= v > > +CATEGORIES= net-mgmt > > > > 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. We are trying to encourage people to upgrade and help new users that just do: `pkg install' get the newer version, instead of discovering later that they installed the old one. There is a hook in the version 2 start up script and a pkg-message to help with this. Regards, Brad Davis