/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/po_merge/po_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/po_merge/po_merge.py
99
99
            # Return early if there is no options defined
100
100
            return False
101
101
        po_dir = None
102
 
        po_path = self.get_filepath(params, self.merger.this_tree)
 
102
        po_path = params.this_path
103
103
        for po_dir in self.po_dirs:
104
104
            glob = osutils.pathjoin(po_dir, self.po_glob)
105
105
            if fnmatch.fnmatch(po_path, glob):