[csw-devel] SF.net SVN: gar:[15903] csw/mgar/gar/v2/gar.pkg.mk

[Sebastian Kayser]

* Maciej (Matchek) Blizi??ski <maciej at opencsw.org> wrote:
> 2011/10/10  <skayser at users.sourceforge.net>:
> > Revision: 15903
> >          http://gar.svn.sourceforge.net/gar/?rev=15903&view=rev
> > Author:   skayser
> > Date:     2011-10-10 09:07:57 +0000 (Mon, 10 Oct 2011)
> > Log Message:
> > -----------
> > gar/v2: fix CATALOG_RELEASE regex
> >
> > Modified Paths:
> > --------------
> >    csw/mgar/gar/v2/gar.pkg.mk
> >
> > Modified: csw/mgar/gar/v2/gar.pkg.mk
> > ===================================================================
> > --- csw/mgar/gar/v2/gar.pkg.mk  2011-10-10 07:44:44 UTC (rev 15902)
> > +++ csw/mgar/gar/v2/gar.pkg.mk  2011-10-10 09:07:57 UTC (rev 15903)
> > @@ -62,7 +62,7 @@
> >  # set CATALOG_RELEASE to 'current'. Used by checkpkg to query the right branch
> >  # in the buildfarm pkgdb. For off-site usage this can default to unstable.
> >  HOSTNAME := $(shell hostname)
> > -CATALOG_RELEASE ?= $(shell echo $(HOSTNAME) | gsed -e 's/[0-9][sx]*$$//')
> > +CATALOG_RELEASE ?= $(shell echo $(HOSTNAME) | gsed -re 's/[0-9]{1,2}[sx]$$//')
> 
> Oh, the missing count spec after [0-9], sorry for not catching that!

No problem. I briefly thought about encoding the valid catalog names in
GAR to catch an invalid catalog name earlier than at the checkpkg stage,
but then we'd store the catalog names in yet another location. Thus, the
quick fix for now.

Sebastian