/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 bzrlib/patch.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patch.py
20
20
import os
21
21
from subprocess import Popen, PIPE
22
22
 
23
 
from .errors import NoDiff3
24
 
from .textfile import check_text_path
 
23
from bzrlib.errors import NoDiff3
 
24
from bzrlib.textfile import check_text_path
25
25
 
26
26
"""Diff and patch functionality"""
27
27
 
89
89
    args.extend((mine_path, older_path, yours_path))
90
90
    try:
91
91
        output, stderr, status = write_to_cmd(args)
92
 
    except OSError as e:
 
92
    except OSError, e:
93
93
        if e.errno == errno.ENOENT:
94
94
            raise NoDiff3
95
95
        else: