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

Warn when trying to commit a prj/pac managed in scm

Browse Source
This commit is contained in:
Daniel Mach 2022-06-07 16:45:45 +02:00
parent 715a30f3f3
commit 295ea7f356
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osc/commandline.py
View File

@ -5015,10 +5015,16 @@ Please submit there instead, or use --nodevelproject to force direct submission.
skip_local_service_run = False skip_local_service_run = False
if not conf.config['local_service_run'] or opts.skip_local_service_run: if not conf.config['local_service_run'] or opts.skip_local_service_run:
skip_local_service_run = True skip_local_service_run = True
arg_list = args[:]
for arg in arg_list: for arg in args.copy():
if conf.config['do_package_tracking'] and is_project_dir(arg): if conf.config['do_package_tracking'] and is_project_dir(arg):
prj = Project(arg) prj = Project(arg)
if prj.scm_url:
print("WARNING: Skipping project '{}' because it is managed in scm (git): {}".format(prj.name, prj.scm_url))
args.remove(arg)
continue
if not msg and not opts.no_message: if not msg and not opts.no_message:
msg = edit_message() msg = edit_message()
@ -5037,6 +5043,12 @@ Please submit there instead, or use --nodevelproject to force direct submission.
pacs, no_pacs = findpacs(args, fatal=False) pacs, no_pacs = findpacs(args, fatal=False)
for pac in pacs.copy():
if pac.scm_url:
print("WARNING: Skipping package '{}' because it is managed in scm (git): {}".format(pac.name, pac.scm_url))
pacs.remove(pac)
continue
if conf.config['do_package_tracking'] and (pacs or no_pacs): if conf.config['do_package_tracking'] and (pacs or no_pacs):
prj_paths = {} prj_paths = {}
single_paths = [] single_paths = []