From: Tobias Ulmer <tobias.ulmer@emlix.com>
Date: Sun, 18 Apr 2010 04:18:55 +0000 (+0200)
Subject: collect_project: bugfix: invalid makefile code was generated for archive
X-Git-Tag: e2factory-2.3.5~2
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=5323695e315c13f8bb8750cb64c62c26f089780c;p=e2factory.git

collect_project: bugfix: invalid makefile code was generated for archive
files configured to be copied, not unpacked.

Signed-off-by: Gordon Hecker <gh@emlix.com>
---

diff --git a/Changelog b/Changelog
index eeaae9c..6111d48 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 NEXT:
+ * bugfixes in collect_project: Copying files was not handled correctly
 
 e2factory-2.3.4
  * version information for plugins is displayed now when requested
diff --git a/local/files.lua b/local/files.lua
index 6e9250d..20444f3 100644
--- a/local/files.lua
+++ b/local/files.lua
@@ -392,18 +392,21 @@ function files.toresult(info, sourcename, sourceset, directory)
 					"\tcd source && sha1sum -c '%s'\n",
 					e2lib.basename(checksum_file)))
 		end
-		local c = e2lib.howtounpack(
-			string.format("%s/%s", destdir,
+		if file.unpack then
+			local c = e2lib.howtounpack(
+				string.format("%s/%s", destdir,
 						e2lib.basename(file.location)),
-			string.format("%s/%s", source,
+				string.format("%s/%s", source,
 						e2lib.basename(file.location)),
-			string.format("$(BUILD)"))
-		if c then
-			f:write(string.format("\t%s\n", c))
-		end
-		if file.unpack and file.unpack ~= sourcename then
-			f:write(string.format(
-			"\tln -s %s $(BUILD)/%s\n", file.unpack, sourcename))
+				string.format("$(BUILD)"))
+			if c then
+				f:write(string.format("\t%s\n", c))
+			end
+			if file.unpack ~= sourcename then
+				f:write(string.format(
+				"\tln -s %s $(BUILD)/%s\n", file.unpack,
+				sourcename))
+			end
 		end
 		if file.copy then
 			f:write(string.format(