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

allow build in read-only directory

Browse Source
This commit is contained in:
Ludwig Nussel 2009-11-26 09:52:26 +00:00
parent e57b3548c9
commit 75bdc2e6c7
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osc/build.py
View File

@ -391,8 +391,19 @@ def main(opts, argv):
cpio.add(os.path.basename(build_descr), build_descr_data) cpio.add(os.path.basename(build_descr), build_descr_data)
build_descr_data = cpio.get() build_descr_data = cpio.get()
bi_filename = os.path.join(os.getcwd(), '.osc/_buildinfo-%s-%s.xml' % (repo, arch)) bi_file = None
bc_filename = os.path.join(os.getcwd(), '.osc/_buildconfig-%s-%s' % (repo, arch)) bc_file = None
bi_filename = '_buildinfo-%s-%s.xml' % (repo, arch)
bc_filename = '_buildconfig-%s-%s' % (repo, arch)
if os.path.isdir(osc.core.store) and os.access(osc.core.store, os.W_OK):
bi_filename = os.path.join(os.getcwd(), osc.core.store, bi_filename)
bc_filename = os.path.join(os.getcwd(), osc.core.store, bc_filename)
elif not os.access('.', os.W_OK):
bi_file = NamedTemporaryFile(prefix=bi_filename)
bi_filename = bi_file.name
bc_file = NamedTemporaryFile(prefix=bc_filename)
bc_filename = bc_file.name
try: try:
if opts.noinit: if opts.noinit:
if not os.path.isfile(bi_filename): if not os.path.isfile(bi_filename):
@ -405,6 +416,7 @@ def main(opts, argv):
print 'Use local \'%s\' file as buildconfig' % bc_filename print 'Use local \'%s\' file as buildconfig' % bc_filename
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_file = open(bi_filename, 'w')
bi_text = ''.join(get_buildinfo(apiurl, bi_text = ''.join(get_buildinfo(apiurl,
prj, prj,
@ -414,11 +426,12 @@ def main(opts, argv):
specfile=build_descr_data, specfile=build_descr_data,
addlist=extra_pkgs)) addlist=extra_pkgs))
bi_file.write(bi_text) bi_file.write(bi_text)
bi_file.close() 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
if not bc_file:
bc_file = open(bc_filename, 'w') bc_file = open(bc_filename, 'w')
bc_file.write(get_buildconfig(apiurl, prj, pac, repo, arch)) bc_file.write(get_buildconfig(apiurl, prj, pac, repo, arch))
bc_file.close() bc_file.flush()
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
if e.code == 404: if e.code == 404:
# check what caused the 404 # check what caused the 404
@ -639,3 +652,9 @@ def main(opts, argv):
for i in b_built.splitlines() + s_built.splitlines(): for i in b_built.splitlines() + s_built.splitlines():
import shutil import shutil
shutil.copy2(i, os.path.join(opts.keep_pkgs, os.path.basename(i))) shutil.copy2(i, os.path.join(opts.keep_pkgs, os.path.basename(i)))
if bi_file:
bi_file.close()
if bc_file:
bc_file.close()
rpmlist_file.close()

3
osc/commandline.py
View File

@ -3012,6 +3012,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if not arg_repository in repositories: if not arg_repository in repositories:
raise oscerr.WrongArgs('%s is not a valid repository, use one of: %s' % (arg_repository, ", ".join(repositories))) raise oscerr.WrongArgs('%s is not a valid repository, use one of: %s' % (arg_repository, ", ".join(repositories)))
if not arg_repository:
raise oscerr.WrongArgs('please specify a repository')
# check for source services # check for source services
if os.listdir('.').count("_service"): if os.listdir('.').count("_service"):
p = Package('.') p = Package('.')