mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

- do_addremove: fixed "corner case"

Browse Source 
Assume $PWD/x is a directory and /path/to/pkg/x is an unversioned file.
Without this fix, "osc ar /path/to/pkg" did not add the file "x".
This commit is contained in:
Marcus Huewe 2014-10-21 22:23:28 +02:00
parent e8f0e78672
commit 26ffaa9de8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osc/commandline.py
View File

@ -4271,7 +4271,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
for p in pacs:
todo = list(set(p.filenamelist + p.filenamelist_unvers + p.to_be_added))
for filename in todo:
if os.path.isdir(filename):
abs_filename = os.path.join(p.absdir, filename)
if os.path.isdir(abs_filename):
continue
# ignore foo.rXX, foo.mine for files which are in 'C' state
if os.path.splitext(filename)[0] in p.in_conflict: