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

[dmichelsen at users.sourceforge.net]

Revision: 14334
          http://gar.svn.sourceforge.net/gar/?rev=14334&view=rev
Author:   dmichelsen
Date:     2011-04-20 12:03:21 +0000 (Wed, 20 Apr 2011)

Log Message:
-----------
mGAR v2: Fix wrong parantheses in obsoletion resulting in only the last dependency dropped in obsoletion file

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-04-20 09:47:17 UTC (rev 14333)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-04-20 12:03:21 UTC (rev 14334)
@@ -719,12 +719,12 @@
 	$(_DBG_MERGE)rm -f $(COOKIEDIR)/merge-distfile-$* $(foreach SPEC,$(_PKG_SPECS),$(PKGROOT)$(docdir)/$(call catalogname,$(SPEC))/$*)
 
 merge-obsolete: $(WORKDIR_GLOBAL)
-	$(_DBG_MERGE)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETED_BY_$Q)), \
-		($(if $(SPKG_DESC_$Q), \
+	$(_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 - ") | $(GAWK) '{ $$1 = "P"; print }')"; \
-		)) > $(WORKDIR_GLOBAL)/$P.obsolete; \
-	)))
+		)))) > $(WORKDIR_GLOBAL)/$P.obsolete; \
+	)
 	@$(MAKECOOKIE)
 
 .PHONY: reset-merge-obsolete


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