mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-05 02:56:17 +01:00
Code

addremove: ignore foo.rXX, foo.mine for files which are in 'C' state

Browse Source
This commit is contained in:
Dr. Peter Poeml 2007-07-06 11:20:30 +00:00
parent 3b78077453
commit eaa08653e0
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osc/commandline.py
View File

@ -684,6 +684,9 @@ class Osc(cmdln.Cmdln):
for filename in p.todo: for filename in p.todo:
if os.path.isdir(filename): if os.path.isdir(filename):
continue continue
# ignore foo.rXX, foo.mine for files which are in 'C' state
if os.path.splitext(filename)[0] in p.in_conflict:
continue
state = p.status(filename) state = p.status(filename)
if state == '?': if state == '?':
p.addfile(filename) p.addfile(filename)