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

login
register
mail settings
Submitter Luca Ceresoli
Date May 14, 2013, 12:46 p.m.
Message ID <1368535563-10393-1-git-send-email-luca@lucaceresoli.net>
Download mbox | patch
Permalink /patch/243695/
State Accepted
Commit 376c3aad61dbeb8e2126e13658fd150b70746afb
Headers show

Comments

Luca Ceresoli - May 14, 2013, 12:46 p.m.
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.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/pkg-generic.mk |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Peter Korsgaard - May 14, 2013, 3:18 p.m.
>>>>> "Luca" == Luca Ceresoli <luca@lucaceresoli.net> 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.

Patch

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index b55b5f0..56fca6b 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -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)