[NaCl SDK] Make verification failures a little easier to read.

native_client_sdk/src/build_tools/build_sdk.py

Index: native_client_sdk/src/build_tools/build_sdk.py
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index d856b04f99798aedd42793e4f9c7605f1e0ef2c1..b73ee2c0e8f1a49749cae2647c7f85824d21eb03 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -751,9 +751,23 @@ def GenerateNotice(fileroot, output_filename='NOTICE', extra_files=None):
 
 def BuildStepVerifyFilelist(pepperdir, platform):
   buildbot_common.BuildStep('Verify SDK Files')
-  verify_filelist.Verify(platform, os.path.join(SCRIPT_DIR, 'sdk_files.list'),
-                         pepperdir)
-  print 'OK'
+  file_list_path = os.path.join(SCRIPT_DIR, 'sdk_files.list')
+  try:
+    verify_filelist.Verify(platform, file_list_path, pepperdir)
+    print 'OK'
+  except verify_filelist.ParseException, e:
+    print 'Parsing sdk_files.list failed:\n\n', e
+  except verify_filelist.VerifyException, e:
+    file_list_rel = os.path.relpath(file_list_path)
+    verify_filelist_py = os.path.splitext(verify_filelist.__file__)[0] + '.py'
+    verify_filelist_py = os.path.relpath(verify_filelist_py)
+    pepperdir_rel = os.path.relpath(pepperdir)
+
+    print 'SDK verification failed:\n\n', e
+    print 'Add/remove files from %s to fix.\n' % file_list_rel
+    print 'Run:'
+    print '    ./%s %s %s' % (verify_filelist_py, file_list_rel, pepperdir_rel)
+    print 'to test.'

[Sam Clegg, 2013/06/03 19:31:44]

Don't you need to actually error out here in both cases?

ErrorExit()?

 
 
 def BuildStepTarBundle(pepper_ver, tarfile):