mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-25 22:36:13 +01:00
Code

- do not try to merge generated _service: files on pull

Browse Source
This commit is contained in:
Adrian Schröter 2011-03-17 15:35:22 +01:00
parent c859fc5430
commit 4f8bedf998
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/commandline.py
View File

@ -6246,6 +6246,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
entries.update(entries_oldpatched) entries.update(entries_oldpatched)
entries.update(entries_new) entries.update(entries_new)
for name in sorted(entries.keys()): for name in sorted(entries.keys()):
if name.startswith('_service:') or name.startswith('_service_'):
continue
md5_old = entries_old.get(name, '') md5_old = entries_old.get(name, '')
md5_new = entries_new.get(name, '') md5_new = entries_new.get(name, '')
md5_oldpatched = entries_oldpatched.get(name, '') md5_oldpatched = entries_oldpatched.get(name, '')