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

- fixed #646886 ('"osc build" when iChain is broken trashes local _buildinfo, _buildconfig')

Browse Source
This commit is contained in:
Marcus Huewe 2011-01-20 20:54:38 +01:00
parent dd377b07a6
commit fe8febe56e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osc/build.py
View File

@ -555,8 +555,6 @@ def main(apiurl, opts, argv):
raise oscerr.WrongOptions('--offline is not possible, no local buildconfig file') raise oscerr.WrongOptions('--offline is not possible, no local buildconfig file')
else: else:
print 'Getting buildinfo from server and store to %s' % bi_filename print 'Getting buildinfo from server and store to %s' % bi_filename
if not bi_file:
bi_file = open(bi_filename, 'w')
bi_text = ''.join(get_buildinfo(apiurl, bi_text = ''.join(get_buildinfo(apiurl,
prj, prj,
pac, pac,
@ -564,12 +562,16 @@ def main(apiurl, opts, argv):
arch, arch,
specfile=build_descr_data, specfile=build_descr_data,
addlist=extra_pkgs)) addlist=extra_pkgs))
if not bi_file:
bi_file = open(bi_filename, 'w')
# maybe we should check for errors before saving the file
bi_file.write(bi_text) bi_file.write(bi_text)
bi_file.flush() bi_file.flush()
print 'Getting buildconfig from server and store to %s' % bc_filename print 'Getting buildconfig from server and store to %s' % bc_filename
bc = get_buildconfig(apiurl, prj, repo)
if not bc_file: if not bc_file:
bc_file = open(bc_filename, 'w') bc_file = open(bc_filename, 'w')
bc_file.write(get_buildconfig(apiurl, prj, repo)) bc_file.write(bc)
bc_file.flush() bc_file.flush()
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
if e.code == 404: if e.code == 404: