display location of failed patch in error message

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

diff --git a/Changelog b/Changelog
index 1f39ae6beefc9afff41ee3c77bd027245424cfd8..39b3f2d1a006d657042c778452032bbb3ff68fc6 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -10,6 +10,8 @@ NEXT:
  * a bug in configuration validation for files sources was fixed
  * a bug in validating the licences attribute in source configurations was
    fixed
+ * the location of a patch that does not apply is included in the error
+   message now
  * unused code was removed
  * the faq section in the documentation was extended
  * outdated documentation was removed

diff --git a/local/files.lua b/local/files.lua
index bd7b7eacf9f030142422883ed7218f73916e0473..b47b3503ba381735d5fbac8509918695c375d714 100644 (file)
--- a/local/files.lua
+++ b/local/files.lua
@@ -269,6 +269,7 @@ function files.prepare_source(info, sourcename, sourceset, buildpath)
                                                                symlink, path)
        rc, re = e2lib.patch(args)
        if not rc then
+         e:append("applying patch: \"%s:%s\"", file.server, file.location)
          return false, e:cat(re)
        end
       elseif file.copy then