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 eeaae9c621b5512a4a46b32ad230c5497f75f62a..6111d48b88f899ee20eadcfc88a3032eb37fabea 100644 (file)
--- 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 6e9250dc8ac905287926beb2324f181ffeccc14a..20444f3ace5e1dfc5abfd41d5c8225643485e798 100644 (file)
--- 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(