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

[skayser at users.sourceforge.net]

Revision: 15798
          http://gar.svn.sourceforge.net/gar/?rev=15798&view=rev
Author:   skayser
Date:     2011-09-28 21:45:07 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
gar/v2: default to CATALOG_RELEASE=unstable if on non-buildfarm host

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-09-28 21:36:19 UTC (rev 15797)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-09-28 21:45:07 UTC (rev 15798)
@@ -59,8 +59,13 @@
 RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
 
 # Set the catalog release based on hostname.  E.g. building on current9s will
-# set CATALOG_RELEASE to 'current'.
-CATALOG_RELEASE ?= $(shell hostname | gsed -e 's/[0-9].*$$//')
+# 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]*$$//')
+ifeq ($(HOSTNAME),$(CATALOG_RELEASE))
+CATALOG_RELEASE=unstable
+endif
 
 define obsoleted_pkg
 # function 'catalogname' must not be used due to recursive calls to CATALOGNAME_*

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.