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

[bdwalton at users.sourceforge.net]

Revision: 16034
          http://gar.svn.sourceforge.net/gar/?rev=16034&view=rev
Author:   bdwalton
Date:     2011-10-30 00:58:34 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
gar/v2: ensure that migrateconf handling is not applied to stub packages

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-30 00:03:43 UTC (rev 16033)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-10-30 00:58:34 UTC (rev 16034)
@@ -218,7 +218,7 @@
 
 SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg
 
-MIGRATECONF ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf)))
+MIGRATECONF ?= $(strip $(foreach S,$(filter-out $(OBSOLETED_PKGS),$(SPKG_SPECS)),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf)))
 
 # It is NOT sufficient to change the pathes here, they must be adjusted in merge-* also
 _USERGROUP_FILES ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(value $(S)_usergroup),/etc/opt/csw/pkg/$S/cswusergroup)))
@@ -765,7 +765,7 @@
 reset-merge-php5ext:
 	@rm -f $(COOKIEDIR)/post-merge-php5ext
 
-merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S))
+merge-migrateconf: $(foreach S,$(filter-out $(OBSOLETED_PKGS),$(SPKG_SPECS)),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S))
 	@$(MAKECOOKIE)
 
 merge-migrateconf-%:

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