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

Merge branch 'fix_osc_co_outdir_project' of https://github.com/Ericsson/osc

Browse Source
This commit is contained in:
Marcus Huewe 2016-07-08 11:48:52 +02:00
commit 58adc14dd4
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osc/commandline.py
View File

@ -4279,20 +4279,16 @@ Please submit there instead, or use --nodevelproject to force direct submission.
print_request_list(apiurl, project, package) print_request_list(apiurl, project, package)
elif project: elif project:
prj_dir = project prj_dir = opts.output_dir if opts.output_dir else project
if sys.platform[:3] == 'win': if sys.platform[:3] == 'win':
prj_dir = prj_dir.replace(':', ';') prj_dir = prj_dir.replace(':', ';')
if os.path.exists(prj_dir): if os.path.exists(prj_dir):
sys.exit('osc: project \'%s\' already exists' % project) sys.exit('osc: project directory \'%s\' already exists' % prj_dir)
# check if the project does exist (show_project_meta will throw an exception) # check if the project does exist (show_project_meta will throw an exception)
show_project_meta(apiurl, project) show_project_meta(apiurl, project)
if opts.output_dir is not None: Project.init_project(apiurl, prj_dir, project, conf.config['do_package_tracking'])
init_dir=opts.output_dir
else:
init_dir=prj_dir
Project.init_project(apiurl, init_dir, project, conf.config['do_package_tracking'])
print(statfrmt('A', prj_dir)) print(statfrmt('A', prj_dir))
# all packages # all packages
@ -4321,7 +4317,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
prj_dir = prj_dir, service_files = opts.source_service_files, \ prj_dir = prj_dir, service_files = opts.source_service_files, \
server_service_files = opts.server_side_source_service_files, \ server_service_files = opts.server_side_source_service_files, \
progress_obj=self.download_progress, size_limit=opts.limit_size, \ progress_obj=self.download_progress, size_limit=opts.limit_size, \
meta=opts.meta,outdir=outputdir) meta=opts.meta)
except oscerr.LinkExpandError as e: except oscerr.LinkExpandError as e:
print('Link cannot be expanded:\n', e, file=sys.stderr) print('Link cannot be expanded:\n', e, file=sys.stderr)
print('Use "osc repairlink" for fixing merge conflicts:\n', file=sys.stderr) print('Use "osc repairlink" for fixing merge conflicts:\n', file=sys.stderr)