Revision: 15248
http://gar.svn.sourceforge.net/gar/?rev=15248&view=rev
Author: wahwah
Date: 2011-08-03 09:05:46 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
Fix SPKG_DESC duplicate checking
Works around ticket #56.
http://sourceforge.net/apps/trac/gar/ticket/56
Previous attempt at fixing it:
http://sourceforge.net/apps/trac/gar/changeset/11424
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-08-03 01:36:31 UTC (rev 15247)
+++ csw/mgar/gar/v2/gar.pkg.mk 2011-08-03 09:05:46 UTC (rev 15248)
@@ -640,9 +640,16 @@
$(foreach P,$(SPKG_SPECS),\
$(if $(SPKG_DESC_$(P)),,$(error Multiple packages defined and
SPKG_DESC_$(P) is not set.))))
+# There was a bug here.
+# http://sourceforge.net/apps/trac/gar/ticket/56
+# The workaround was to add an additional check whether the strings are the
+# same or not.
$(foreach P,$(SPKG_SPECS),\
$(foreach Q,$(filter-out $(P) $(OBSOLETED_PKGS),$(SPKG_SPECS)),\
- $(if $(filter-out $(subst ,_,$(SPKG_DESC_$(P))),$(subst
,_,$(SPKG_DESC_$(Q)))),,$(error The package descriptions for $(P) [$(if
$(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),<not set>)] and $(Q) [$(if
$(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),<not set>)] are identical. Please make
sure that all descriptions are unique by setting SPKG_DESC_<pkg> for each
package.))))
+ $(if $(filter-out $(subst ,_,$(SPKG_DESC_$(P))),$(subst
,_,$(SPKG_DESC_$(Q)))),\
+ ,\
+ $(if $(shell if [ "$(SPKG_DESC_$(P))" = "$(SPKG_DESC_$(Q))" ]; then
echo bad; fi),\
+ $(error The package descriptions for $(P) [$(if
$(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),<not set>)] and $(Q) [$(if
$(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),<not set>)] are identical. Please make
sure that all descriptions are unique by setting SPKG_DESC_<pkg> for each
package.),))))
.PRECIOUS: $(WORKDIR)/%.pkginfo
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
