Commit 79ef0b8c authored by Vincent A's avatar Vincent A

tools/stable_backport: don't search original file for manual port data

parent c10d8276
...@@ -70,15 +70,15 @@ class Error(object): ...@@ -70,15 +70,15 @@ class Error(object):
target = path.join(self.compat_dir, '%s.py' % new_module) target = path.join(self.compat_dir, '%s.py' % new_module)
base_module = '.'.join(module.split('.')[:-1]) base_module = '.'.join(module.split('.')[:-1])
try:
r = check_output('git show %s:%s' % (DEVEL_BRANCH, filename), shell=True, stderr=STDOUT).decode('utf-8')
except CalledProcessError:
# this file does not exist, perhaps a directory.
return
if module in MANUAL_PORTS: if module in MANUAL_PORTS:
shutil.copyfile(path.join(MANUAL_PORT_DIR, path.basename(target)), target) shutil.copyfile(path.join(MANUAL_PORT_DIR, path.basename(target)), target)
else: else:
try:
r = check_output('git show %s:%s' % (DEVEL_BRANCH, filename), shell=True, stderr=STDOUT).decode('utf-8')
except CalledProcessError:
# this file does not exist, perhaps a directory.
return
# Copy module from devel to a compat/ sub-module # Copy module from devel to a compat/ sub-module
with open(target, 'w') as fp: with open(target, 'w') as fp:
for line in r.split('\n'): for line in r.split('\n'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment