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

[skayser at users.sourceforge.net]

Revision: 6374
          http://gar.svn.sourceforge.net/gar/?rev=6374&view=rev
Author:   skayser
Date:     2009-09-22 09:34:54 +0000 (Tue, 22 Sep 2009)

Log Message:
-----------
gar/v2: fix USERGROUP handling, cswusergroup needs to be prepended

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-09-22 08:29:08 UTC (rev 6373)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-09-22 09:34:54 UTC (rev 6374)
@@ -160,11 +160,12 @@
 SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg
 
 # Handle cswclassutils
-# - prepend cswpreserveconf if it is not already in SPKG_CLASSES
+# - append csw* classes if they are used and not already contained in SPKG_CLASSES
+# - exception: prepend cswusergroup so that required accounts are setup first
 SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswcpsampleconf,$(SPKG_CLASSES)),,cswcpsampleconf))
 SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf))
 SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf))
-SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup))
+SPKG_CLASSES := $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) $(SPKG_CLASSES) 
 SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PYCOMPILE),$(if $(filter cswpycompile,$(SPKG_CLASSES)),,cswpycompile))
 # - set class for all config files
 ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),)


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