svn commit: r461844 - in head: . net-mgmt net-mgmt/prometheus net-mgmt/prometheus1 net-mgmt/prometheus2 net-mgmt/prometheus2/files

[Brad Davis]

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 <dor.bsd at xm0.uk>
> >   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