1588 - Integrate ensure_dependencies.py with the adblockplus repository

build.py

 #!/usr/bin/env python
 # coding: utf-8
 
 import os, sys, subprocess
 
-DEPENDECY_SCRIPT = os.path.join(os.getcwd(), "ensure_dependencies.py")

[Wladimir Palant, 2014/12/17 14:29:32]

1) Nit: DEPENDENCY_SCRIPT please.
2) Don't use current work directory, this should be os.path.dirname(__file__).

+DEPENDENCY_SCRIPT = os.path.join(os.path.dirname(__file__), "ensure_dependencies.py")
 
-try:
-    subprocess.check_call(["python", DEPENDECY_SCRIPT])

[Wladimir Palant, 2014/12/17 14:29:32]

Only call this if the script actually exists please - this file should be the
same everywhere, and we don't want any warnings if there are no dependencies.

-except subprocess.CalledProcessError as e:
-    print >>sys.stderr, str(e)+'\n'

[Wladimir Palant, 2014/12/17 14:29:32]

print will automatically add a newline, no need to do this. Also, e doesn't need
to be converted to string explicitly:

  print >>sys.stderr, e

-    print >>sys.stderr,"Failed to ensure dependencies being up-to-date!"+'\n'

[Wladimir Palant, 2014/12/17 14:29:32]

Style nit: space after comma please.

Newline is unnecessary here as well.

+if os.path.isfile(DEPENDENCY_SCRIPT):
+  try:
+    subprocess.check_call(["python", DEPENDENCY_SCRIPT])
+  except subprocess.CalledProcessError as e:
+    print >>sys.stderr, e
+    print >>sys.stderr, "Failed to ensure dependencies being up-to-date!"
 
 import buildtools.build
 buildtools.build.processArgs('.', sys.argv)