← Back to branch summary

~mwhudson/bzr-builder/RecipeParserTests-inherit-TestCase

« back to all changes in this revision

Viewing changes to recipe.py

  • Committer: James Westby
  • Date: 2009-12-03 04:25:17 UTC
  • mfrom: (60.1.1 pyflakes)
  • Revision ID: james.westby@canonical.com-20091203042517-81zdtekoon8ht8h2
pyflakes cleanup. Thanks Michael.

Show diffs side-by-side

added added

removed removed

Lines of Context:
recipe.py
120
120
        # We do a "pull"
121
121
        if tree_to is not None:
122
122
            # FIXME: should these pulls overwrite?
123
 
            result = tree_to.pull(br_from, stop_revision=revision_id,
 
123
            tree_to.pull(br_from, stop_revision=revision_id,
124
124
                    possible_transports=possible_transports)
125
125
        else:
126
 
            result = br_to.pull(br_from, stop_revision=revision_id,
 
126
            br_to.pull(br_from, stop_revision=revision_id,
127
127
                    possible_transports=possible_transports)
128
128
            tree_to = br_to.bzrdir.create_workingtree()
129
129
            # Ugh, we have to assume that the caller replaces their reference
256
256
                changed = True
257
257
        for index, instruction in enumerate(new_branch.child_branches):
258
258
            child_branch = instruction.recipe_branch
259
 
            nest_location = instruction.nest_path
260
259
            if_changed_child = None
261
260
            if if_changed_from is not None:
262
261
                if_changed_child = if_changed_from.child_branches[index].recipe_branch