Revert of Make allow_subannotations more robust.

scripts/slave/recipe_modules/step/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from slave import recipe_api
 from slave import recipe_util
 
 # Inherit from RecipeApiPlain because the only thing which is a step is
 # run_from_dict()
 class StepApi(recipe_api.RecipeApiPlain):
+  def __init__(self, **kwargs):
+    super(StepApi, self).__init__(**kwargs)
+    self._step_names = {}
+
   EXCEPTION = 'EXCEPTION'
   FAILURE = 'FAILURE'
   SUCCESS = 'SUCCESS'
   WARNING = 'WARNING'
 
   @property
   def StepFailure(self):
     """ See recipe_api.py for docs. """
     return recipe_api.StepFailure
 
@@ skipping 63 matching lines @@
     assert 'shell' not in kwargs
     assert isinstance(cmd, list)
     if not ok_ret:
       ok_ret = {0}
     if ok_ret in ('any', 'all'):
       ok_ret = set(range(-256, 256))
 
     command = list(wrapper)
     command += cmd
 
+    step_count = self._step_names.setdefault(name, 0) + 1
+    self._step_names[name] = step_count
+    if step_count > 1:
+      name = "%s (%d)" % (name, step_count)
+
     kwargs.update({'name': name, 'cmd': command})
     kwargs['ok_ret'] = ok_ret
     kwargs['infra_step'] = bool(infra_step)
 
     schema = self.make_config()
     schema.set_val(kwargs)
     return self.run_from_dict(self._engine.create_step(schema))
 
   # TODO(martiniss) delete, and make generator_script use **kwargs on step()
   @recipe_api.composite_step
   def run_from_dict(self, dct):
     return self._engine.run_step(dct)