← Back to branch summary

~rom1-chal/bzr-builder/merge-all-what-can-be

« back to all changes in this revision

Viewing changes to recipe.py

  • Committer: James Westby
  • Date: 2010-08-12 14:04:50 UTC
  • mfrom: (52.2.13 working)
  • Revision ID: james.westby@canonical.com-20100812140450-b5r1tbcsfns0fako
Fixes for the nest-part instruction. Thanks Andrew.

Show diffs side-by-side

added added

removed removed

Lines of Context:
recipe.py
818
818
                        target_subdir = self.parse_optional_path()
819
819
                        if target_subdir == '':
820
820
                            target_subdir = None
821
 
                    revspec = self.parse_optional_revspec()
 
821
                            revspec = None
 
822
                        else:
 
823
                            revspec = self.parse_optional_revspec()
 
824
                    else:
 
825
                        revspec = self.parse_optional_revspec()
822
826
                    self.new_line()
823
827
                    last_branch = RecipeBranch(branch_id, url, revspec=revspec)
824
828
                    if instruction == NEST_INSTRUCTION: