Patchwork [CONSOLIDATED,PULL,08/16] insane.bbclass: print full path on invalid LICENSE_FILES_CHKSUM

login
register
mail settings
Submitter Saul Wold
Date Oct. 19, 2011, 8:28 a.m.
Message ID <bda30c4d20c660412eeedeb732da9e08f6deb3c0.1319012721.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/13505/
State New, archived
Headers show

Comments

Saul Wold - Oct. 19, 2011, 8:28 a.m.
From: Darren Hart <dvhart@linux.intel.com>

Currently only the basename is printed when os.path.isfile() returns a failure
for the license file. If the file is present, but in the wrong directory, this
can be non-obvious to debug. Use the full path instead.

Make a minor grammatical correction in the error message while we're at it.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 meta/classes/insane.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index b861e85..017f7be 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -330,7 +330,7 @@  def package_qa_check_license(workdir, d):
         (type, host, path, user, pswd, parm) = bb.decodeurl(url)
         srclicfile = os.path.join(srcdir, path)
         if not os.path.isfile(srclicfile):
-            raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to invalid file: " + path)
+            raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile)
 
         if 'md5' not in parm:
             bb.error(pn + ": md5 checksum is not specified for ", url)