mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-27 23:16:14 +01:00
Code

fix status letter for files merged on update (in analogy to svn , it is either G or U)

Browse Source
This commit is contained in:
Dr. Peter Poeml 2006-05-23 09:59:22 +00:00
parent 4b29f6a501
commit 4ec0b4fbe7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/commandline.py
View File

@ -242,7 +242,7 @@ def main():
print statfrmt(status_after_merge, filename) print statfrmt(status_after_merge, filename)
elif state == 'M': elif state == 'M':
p.updatefile(filename) p.updatefile(filename)
print statfrmt('M', filename) print statfrmt('U', filename)
elif state == '!': elif state == '!':
p.updatefile(filename) p.updatefile(filename)
print 'Restored \'%s\'' % filename print 'Restored \'%s\'' % filename

2
osc/core.py
View File

@ -213,7 +213,7 @@ class Package:
os.rename(upfilename, filename) os.rename(upfilename, filename)
copy_file(filename, storefilename) copy_file(filename, storefilename)
os.unlink(myfilename) os.unlink(myfilename)
return 'M' return 'G'
else: else:
# unsuccessful merge # unsuccessful merge
self.in_conflict.append(n) self.in_conflict.append(n)