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

- fixed repairlink

Browse Source
This commit is contained in:
Marcus Hüwe 2009-08-11 22:58:23 +00:00
parent 863bd5664d
commit 039634c359
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/core.py
View File

@ -763,7 +763,7 @@ class Package:
elif st == 'C':
have_conflicts = True
if have_conflicts or self.islinkrepair():
if have_conflicts:
print 'Please resolve all conflicts before committing using "osc resolved FILE"!'
return 1