mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-26 09:56:13 +01:00
Code

- don't diff binary files

Browse Source
This commit is contained in:
Michael Schröder 2009-04-23 09:03:59 +00:00
parent 630084b582
commit 54300936f0
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osc/commandline.py
View File

@ -2896,6 +2896,15 @@ Please submit there instead, or use --nodevelproject to force direct submission.
else:
self.download(name, md5_new, dir_new, os.path.join(destdir, name + '.new'))
self.download(name, md5_old, dir_old, os.path.join(destdir, name + '.old'))
if binary_file(os.path.join(destdir, name + '.mine')) or \
binary_file(os.path.join(destdir, name + '.old')) or \
binary_file(os.path.join(destdir, name + '.new')):
shutil.copy2(os.path.join(destdir, name + '.new'), os.path.join(destdir, name))
print statfrmt('C', name)
pac.put_on_conflictlist(name)
continue
o = open(os.path.join(destdir, name), 'w')
code = subprocess.call(['diff3', '-m',
'-L', '.mine',