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

- fixed #431434 - we don't need a working copy anymore when building a local package

Browse Source
This commit is contained in:
Marcus Hüwe 2008-10-14 10:38:22 +00:00
parent 1e1ec418cc
commit 16d47f03b5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osc/build.py
View File

@ -258,13 +258,16 @@ def main(opts, argv):
buildargs.append('--debug') buildargs.append('--debug')
buildargs = ' '.join(buildargs) buildargs = ' '.join(buildargs)
prj = store_read_project(os.curdir)
pac = store_read_package(os.curdir)
if opts.local_package: if opts.local_package:
pac = '_repository' pac = '_repository'
if opts.alternative_project: if opts.alternative_project:
prj = opts.alternative_project prj = opts.alternative_project
pac = '_repository' pac = '_repository'
apiurl = config['apiurl']
else:
prj = store_read_project(os.curdir)
pac = store_read_package(os.curdir)
apiurl = store_read_apiurl(os.curdir)
if not os.path.exists(spec): if not os.path.exists(spec):
print >>sys.stderr, 'Error: specfile \'%s\' does not exist.' % spec print >>sys.stderr, 'Error: specfile \'%s\' does not exist.' % spec
@ -292,7 +295,7 @@ def main(opts, argv):
print 'Getting buildinfo from server' print 'Getting buildinfo from server'
bi_file = NamedTemporaryFile(suffix='.xml', prefix='buildinfo.', dir = '/tmp') bi_file = NamedTemporaryFile(suffix='.xml', prefix='buildinfo.', dir = '/tmp')
try: try:
bi_text = ''.join(get_buildinfo(store_read_apiurl(os.curdir), bi_text = ''.join(get_buildinfo(apiurl,
prj, prj,
pac, pac,
repo, repo,
@ -304,8 +307,8 @@ def main(opts, argv):
# check what caused the 404 # check what caused the 404
if meta_exists(metatype='prj', path_args=(quote_plus(prj), ), if meta_exists(metatype='prj', path_args=(quote_plus(prj), ),
template_args=None, create_new=False): template_args=None, create_new=False):
if meta_exists(metatype='pkg', path_args=(quote_plus(prj), quote_plus(pac)), if pac == '_repository' or meta_exists(metatype='pkg', path_args=(quote_plus(prj), quote_plus(pac)),
template_args=None, create_new=False) or pac == '_repository': template_args=None, create_new=False):
print >>sys.stderr, 'wrong repo/arch?' print >>sys.stderr, 'wrong repo/arch?'
sys.exit(1) sys.exit(1)
else: else:
@ -321,7 +324,7 @@ def main(opts, argv):
bi_file.write(bi_text) bi_file.write(bi_text)
bi_file.flush() bi_file.flush()
bi = Buildinfo(bi_file.name, store_read_apiurl(os.curdir)) bi = Buildinfo(bi_file.name, apiurl)
# real arch of this machine # real arch of this machine
# vs. # vs.
@ -387,7 +390,7 @@ def main(opts, argv):
print 'Getting buildconfig from server' print 'Getting buildconfig from server'
bc_file = NamedTemporaryFile(prefix='buildconfig.', dir = '/tmp') bc_file = NamedTemporaryFile(prefix='buildconfig.', dir = '/tmp')
bc_file.write(get_buildconfig(store_read_apiurl(os.curdir), prj, pac, repo, arch)) bc_file.write(get_buildconfig(apiurl, prj, pac, repo, arch))
bc_file.flush() bc_file.flush()