equal
deleted
inserted
replaced
294 fuzz = False |
294 fuzz = False |
295 |
295 |
296 patcher = util.find_in_path('gpatch', os.environ.get('PATH', ''), |
296 patcher = util.find_in_path('gpatch', os.environ.get('PATH', ''), |
297 'patch') |
297 'patch') |
298 args = [] |
298 args = [] |
|
299 if util.needbinarypatch(): |
|
300 args.append('--binary') |
|
301 |
299 if cwd: |
302 if cwd: |
300 args.append('-d %s' % util.shellquote(cwd)) |
303 args.append('-d %s' % util.shellquote(cwd)) |
301 fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip, |
304 fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip, |
302 util.shellquote(patchname))) |
305 util.shellquote(patchname))) |
303 |
306 |