summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-06 20:00:05 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-06 20:00:05 +0000
commit91c3c300069d27c6ec8749636fec1c4c9018b29f (patch)
tree2bb27e2885499a3305fc58eda9f25233f2366782 /tools
parentbff09683af717b4480bf34daf0ee63a9d3bea8ae (diff)
downloadchromium_src-91c3c300069d27c6ec8749636fec1c4c9018b29f.zip
chromium_src-91c3c300069d27c6ec8749636fec1c4c9018b29f.tar.gz
chromium_src-91c3c300069d27c6ec8749636fec1c4c9018b29f.tar.bz2
Revert 84470 (we want DEPS files to stay simple as discussed in irc. Also, this broke tools/sync-webkit-git.py) - Remove nacl_tools_revision and get the appropriate folders/revisions from native client's DEPS file
BUG=none TEST=trybots,gclient sync Review URL: http://codereview.chromium.org/6933043 TBR=elijahtaylor@google.com Review URL: http://codereview.chromium.org/6952009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-xtools/checkdeps/checkdeps.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/checkdeps/checkdeps.py b/tools/checkdeps/checkdeps.py
index 5649a98..e7c49a2 100755
--- a/tools/checkdeps/checkdeps.py
+++ b/tools/checkdeps/checkdeps.py
@@ -243,12 +243,9 @@ def ApplyDirectoryRules(existing_rules, dir_name):
# Check the DEPS file in this directory.
if VERBOSE:
print "Applying rules from", dir_name
- def FromImpl(unused, unused2):
+ def FromImpl(unused):
pass # NOP function so "From" doesn't fail.
- def FileImpl(unused):
- pass # NOP function so "File" doesn't fail.
-
class _VarImpl:
def __init__(self, local_scope):
self._local_scope = local_scope
@@ -260,9 +257,7 @@ def ApplyDirectoryRules(existing_rules, dir_name):
raise Error("Var is not defined: %s" % var_name)
local_scope = {}
- global_scope = {"From": FromImpl,
- "File": FileImpl,
- "Var": _VarImpl(local_scope).Lookup}
+ global_scope = {"From": FromImpl, "Var": _VarImpl(local_scope).Lookup}
deps_file = os.path.join(dir_name, "DEPS")
if os.path.isfile(deps_file):