← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.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/osutils.py
2184
2184
            where = ' in ' + where
2185
2185
        # despite the name 'error' is a type
2186
2186
        raise errors.BzrCommandError('Invalid regular expression%s: %s'
2187
 
            % (where, e.message))
 
2187
            % (where, e.msg))
2188
2188
 
2189
2189
 
2190
2190
if sys.platform == "win32":