mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-27 02:16:12 +01:00
Code

CLI part for committing a deleted, but non-existent package

Browse Source 
That is, a package which has state 'D', but its package working
copy does not exist anymore.
This commit is contained in:
Marcus Huewe 2017-08-04 14:06:24 +02:00
parent 8f68626735
commit 194d179e66
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osc/commandline.py
View File

@ -4621,9 +4621,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
prj.commit(msg=msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose, can_branch=can_branch) prj.commit(msg=msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose, can_branch=can_branch)
args.remove(arg) args.remove(arg)
pacs = findpacs(args) pacs, no_pacs = findpacs(args, fatal=False)
if conf.config['do_package_tracking'] and len(pacs) > 0: if conf.config['do_package_tracking'] and (pacs or no_pacs):
prj_paths = {} prj_paths = {}
single_paths = [] single_paths = []
files = {} files = {}
@ -4643,6 +4643,22 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if not pac.todo: if not pac.todo:
pac.todo = pac.filenamelist + pac.filenamelist_unvers pac.todo = pac.filenamelist + pac.filenamelist_unvers
pac.todo.sort() pac.todo.sort()
for pac in no_pacs:
if os.path.exists(pac):
# fail with an appropriate error message
store_read_apiurl(pac, defaulturl=False)
path = os.path.normpath(os.path.join(pac, os.pardir))
if is_project_dir(path):
pac_path = os.path.normpath(os.path.abspath(pac))
pac_name = os.path.basename(pac_path)
prj_paths.setdefault(path, []).append(pac_name)
pac_objs.setdefault(path, [])
# wrt. the current implementation of Project.commit, this
# actually not needed
files[pac_name] = []
else:
# fail with an appropriate error message
store_read_apiurl(pac, defaulturl=False)
for prj_path, packages in prj_paths.items(): for prj_path, packages in prj_paths.items():
prj = Project(prj_path) prj = Project(prj_path)
if not msg and not opts.no_message: if not msg and not opts.no_message:
@ -4664,6 +4680,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
msg = get_commit_msg(p.absdir, [p]) msg = get_commit_msg(p.absdir, [p])
p.commit(msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose, force=opts.force) p.commit(msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose, force=opts.force)
store_unlink_file(p.absdir, '_commit_msg') store_unlink_file(p.absdir, '_commit_msg')
elif no_pacs:
# fail with an appropriate error message
store_read_apiurl(no_pacs[0], defaulturl=False)
else: else:
for p in pacs: for p in pacs:
if not p.todo: if not p.todo: