mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-09-07 05:38:43 +02:00
Code Activity

* initial support for OBS source services

Browse Source 
* TODO: local service tool calls
This commit is contained in:
Adrian Schröter
2009-07-10 18:10:41 +00:00
parent 009713db18
commit ecf88a57bc
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
osc/core.py
View File

@@ -737,15 +737,16 @@ class Package:
have_conflicts = False
for filename in self.todo:
st = self.status(filename)
if st == 'A' or st == 'M':
self.todo_send.append(filename)
print statfrmt('Sending', os.path.join(pathn, filename))
elif st == 'D':
self.todo_delete.append(filename)
print statfrmt('Deleting', os.path.join(pathn, filename))
elif st == 'C':
have_conflicts = True
if not filename.startswith('_service:'):
st = self.status(filename)
if st == 'A' or st == 'M':
self.todo_send.append(filename)
print statfrmt('Sending', os.path.join(pathn, filename))
elif st == 'D':
self.todo_delete.append(filename)
print statfrmt('Deleting', os.path.join(pathn, filename))
elif st == 'C':
have_conflicts = True
if have_conflicts or self.islinkrepair():
print 'Please resolve all conflicts before committing using "osc resolved FILE"!'
@@ -812,6 +813,13 @@ class Package:
self.write_deletelist()
self.update_datastructs()
if self.filenamelist.count('_service'):
print 'The package contains a source service, update generated files from server...'
for filename in self.todo:
if filename.startswith('_service:') and os.path.exists(filename):
os.unlink(filename)
self.update()
def write_conflictlist(self):
if len(self.in_conflict) == 0:
try: