Skip to contentSkip to conversation

legal-info: fail trying to copy a non-existent license file

PATCH New Luca Ceresoli 2 participants 2 messages May 14, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 legal-info: fail trying to copy a non-existent license file

If a package's _LICENSE_FILES contains the name of a non-existent file, the make process would continue and return true, unless the non-existent file is the last listed.

Fix this wrong beaviour by failing with an error when any of the listed files is missing.

---
 package/pkg-generic.mk |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/pkg-generic.mk +1 -3
index b55b5f0..56fca6b 100644
@@ -508,9 +508,7 @@ ifeq ($(call qstrip,$$($(2)_LICENSE_FILES)),)
 	@$(call legal-license-nofiles,$$($(2)_RAWNAME))
 	@$(call legal-warning-pkg,$$($(2)_RAWNAME),cannot save license ($(2)_LICENSE_FILES not defined))
 else
-	@for F in $$($(2)_LICENSE_FILES); do \
-		$(call legal-license-file,$$($(2)_RAWNAME),$$$${F},$$($(2)_DIR)/$$$${F}); \
-		done
+	@$(foreach F,$($(2)_LICENSE_FILES),$(call legal-license-file,$$($(2)_RAWNAME),$(F),$$($(2)_DIR)/$(F))$$(sep))
 endif
 ifeq ($$($(2)_REDISTRIBUTE),YES)
 # Copy the source tarball (just hardlink if possible)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 legal-info: fail trying to copy a non-existent license file

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Luca" == Luca Ceresoli <[email protected]> writes:

Luca> If a package's _LICENSE_FILES contains the name of a non-existent file, Luca> the make process would continue and return true, unless the Luca> non-existent file is the last listed.

Luca> Fix this wrong beaviour by failing with an error when any of the listed Luca> files is missing.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard