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

- fix broken update after commit with service run

Browse Source 
- fix up -S on unexpanded checkouts
This commit is contained in:
Adrian Schröter 2011-06-09 17:20:51 +02:00
parent 0214a0d160
commit 4f25a8fe63
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/commandline.py
View File

@ -3871,7 +3871,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
print 'Unexpanding to rev', p.linkinfo.lsrcmd5 print 'Unexpanding to rev', p.linkinfo.lsrcmd5
p.update(rev, opts.server_side_source_service_files, opts.limit_size) p.update(rev, opts.server_side_source_service_files, opts.limit_size)
rev = p.linkinfo.lsrcmd5 rev = p.linkinfo.lsrcmd5
elif p.islink() and p.isexpanded(): elif (p.islink() and p.isexpanded()) or opts.server_side_source_service_files:
rev = p.latest_rev(include_service_files=opts.server_side_source_service_files) rev = p.latest_rev(include_service_files=opts.server_side_source_service_files)
p.update(rev, opts.server_side_source_service_files, opts.limit_size) p.update(rev, opts.server_side_source_service_files, opts.limit_size)

11
osc/core.py
View File

@ -1336,11 +1336,13 @@ class Package:
sfilelist = ET.parse(f).getroot() sfilelist = ET.parse(f).getroot()
s = sfilelist.find('serviceinfo') s = sfilelist.find('serviceinfo')
if s.get('code') == "running": if s.get('code') == "running":
print '.', sys.stdout.write('.')
sys.stdout.flush()
else: else:
break break
self.update() print ""
print " updated" rev=self.latest_rev()
self.update(rev=rev)
def __write_storelist(self, name, data): def __write_storelist(self, name, data):
@ -3351,8 +3353,7 @@ def show_upstream_rev(apiurl, prj, pac, revision=None, expand=False, linkrev=Non
et = ET.fromstring(''.join(m)) et = ET.fromstring(''.join(m))
if include_service_files: if include_service_files:
try: try:
if et.find('serviceinfo') and et.find('serviceinfo').get('xsrcmd5'): return et.find('serviceinfo').get('xsrcmd5')
return et.find('serviceinfo').get('xsrcmd5')
except: except:
pass pass
return et.get('rev') return et.get('rev')