← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/globbing.py

  • Committer: Martin Pool
  • Date: 2010-07-17 16:36:00 UTC
  • mfrom: (5050.3.9 2.2)
  • mto: (5050.3.10 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: mbp@canonical.com-20100717163600-jaw27ncuhkhkz8sy
merge news from 2.2b4

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/globbing.py
217
217
                if match:
218
218
                    return patterns[match.lastindex -1]
219
219
        except errors.InvalidPattern, e:
220
 
            # We can't show the default e.message to the user as thats for
 
220
            # We can't show the default e.msg to the user as thats for
221
221
            # the combined pattern we sent to regex. Instead we indicate to
222
222
            # the user that an ignore file needs fixing.
223
 
            mutter('Invalid pattern found in regex: %s.', e.message)
224
 
            e.message = "File ~/.bazaar/ignore or .bzrignore contains errors."
 
223
            mutter('Invalid pattern found in regex: %s.', e.msg)
 
224
            e.msg = "File ~/.bazaar/ignore or .bzrignore contains errors."
225
225
            raise e
226
226
        return None
227
227