mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-25 19:52:12 +01:00
Code

remove a file from conflict list in any case, when it gets removed

Browse Source
This commit is contained in:
Adrian Schröter 2010-07-28 12:13:46 +02:00
parent d128ff4601
commit 10f4a6240d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osc/commandline.py
View File

@ -3100,6 +3100,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
else: else:
pathn = getTransActPath(p.dir) pathn = getTransActPath(p.dir)
for filename in p.todo: for filename in p.todo:
p.clear_from_conflictlist(filename)
ret, state = p.delete_file(filename, opts.force) ret, state = p.delete_file(filename, opts.force)
if ret: if ret:
print statfrmt('D', os.path.join(pathn, filename)) print statfrmt('D', os.path.join(pathn, filename))