/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: 2019-03-04 05:10:44 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7294.
  • Revision ID: jelmer@jelmer.uk-20190304051044-vph4s8p9qvpy2qe9
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/po_merge/po_merge.py
109
109
                         % (self.po_dirs, self.po_glob))
110
110
            return False
111
111
        # Do we have the corresponding .pot file
112
 
        for inv_entry in self.merger.this_tree.list_files(from_dir=po_dir,
113
 
                                                          recursive=False):
114
 
            trace.mutter('inv_entry: %r' % (inv_entry,))
115
 
            pot_name, pot_file_id = inv_entry[0], inv_entry[3]
 
112
        for path, file_class, kind, entry in self.merger.this_tree.list_files(
 
113
                from_dir=po_dir, recursive=False):
 
114
            pot_name, pot_file_id = path, entry
116
115
            if fnmatch.fnmatch(pot_name, self.pot_glob):
117
116
                relpath = osutils.pathjoin(po_dir, pot_name)
118
117
                self.pot_file_abspath = self.merger.this_tree.abspath(relpath)