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

[dmichelsen at users.sourceforge.net]

Revision: 14562
          http://gar.svn.sourceforge.net/gar/?rev=14562&view=rev
Author:   dmichelsen
Date:     2011-05-12 13:42:18 +0000 (Thu, 12 May 2011)

Log Message:
-----------
mGAR v2: Fix contents of obsolete when packages are foreign

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-05-12 13:24:46 UTC (rev 14561)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-05-12 13:42:18 UTC (rev 14562)
@@ -727,10 +727,12 @@
 
 merge-obsolete: $(WORKDIR_GLOBAL)
 	$(_DBG_MERGE)$(foreach P,$(OBSOLETED_PKGS),($(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETED_BY_$Q)), \
-		$(if $(SPKG_DESC_$Q), \
-			echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)";, \
-			echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | perl -npe 's/^\S*\s//;s/\s+/ /')"; \
-		)))) > $(WORKDIR_GLOBAL)/$P.obsolete; \
+		$(if $(filter $Q,$(FOREIGN_PACKAGES)), \
+			echo "$Q";, \
+			$(if $(SPKG_DESC_$Q), \
+				echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)";, \
+				echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | perl -npe 's/^\S*\s//;s/\s+/ /')"; \
+		))))) > $(WORKDIR_GLOBAL)/$P.obsolete; \
 	)
 	@$(MAKECOOKIE)
 


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