mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-09-06 21:28:42 +02:00
Code Activity

aggregatepac: Migrate to pop_project_package_targetproject_targetpackage_from_args()

Browse Source
This commit is contained in:
Daniel Mach
2023-01-02 15:05:35 +01:00
parent d779eb936d
commit fd851bbe83
3 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
osc/commandline.py
View File

@@ -3100,21 +3100,14 @@ Please submit there instead, or use --nodevelproject to force direct submission.
osc aggregatepac SOURCEPRJ SOURCEPAC[:FLAVOR] DESTPRJ [DESTPAC]
"""
args = slash_split(args)
args = list(args)
src_project, src_package, tgt_project, tgt_package = pop_project_package_targetproject_targetpackage_from_args(
args, target_package_is_optional=True,
)
ensure_no_remaining_args(args)
if not args or len(args) < 3:
self.argparse_error("Incorrect number of arguments.")
src_project = self._process_project_name(args[0])
src_package = args[1]
dst_project = self._process_project_name(args[2])
if len(args) > 3:
dst_package = args[3]
else:
dst_package = src_package
if src_project == dst_project and src_package == dst_package:
raise oscerr.WrongArgs('Error: source and destination are the same.')
if not tgt_package:
tgt_package = src_package
repo_map = {}
if opts.map_repo:
@@ -3124,7 +3117,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
raise oscerr.WrongOptions('map "%s" must be SRC=TARGET[,SRC=TARGET]' % opts.map_repo)
repo_map[src_tgt[0]] = src_tgt[1]
aggregate_pac(src_project, src_package, dst_project, dst_package, repo_map, opts.disable_publish, opts.nosources)
aggregate_pac(src_project, src_package, tgt_project, tgt_package, repo_map, opts.disable_publish, opts.nosources)
@cmdln.option('-c', '--client-side-copy', action='store_true',
help='do a (slower) client-side copy')

3
osc/core.py
View File

@@ -5631,6 +5631,9 @@ def aggregate_pac(
- "map" is a dictionary SRC => TARGET repository mappings
- "repo_check" determines if presence of repos in the source and destination repos is checked
"""
if (src_project, src_package) == (dst_project, dst_package):
raise oscerr.OscValueError("Cannot aggregate package. Source and target are the same.")
meta_change = False
dst_meta = ''
apiurl = conf.config['apiurl']