From: Gordon Hecker <gh@emlix.com>
Date: Fri, 2 Oct 2009 13:34:20 +0000 (+0200)
Subject: display location of failed patch in error message
X-Git-Tag: e2factory-2.3.2rc1~44
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=f95c956f1a14cb5d3792b458da37948f86f3c453;p=e2factory.git

display location of failed patch in error message

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

diff --git a/Changelog b/Changelog
index 1f39ae6..39b3f2d 100644
--- 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 bd7b7ea..b47b350 100644
--- 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