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

Merge pull request #1624 from adrianschroeter/allow-native-checkout

Browse Source 
checkout: allow to checkout obs imported sources of scmsync sources
This commit is contained in:
Daniel Mach 2024-11-08 08:44:54 +01:00 committed by GitHub
commit 3476199b30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osc/commandline.py
View File

@ -5007,6 +5007,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
help='Use server side generated sources instead of local generation.') help='Use server side generated sources instead of local generation.')
@cmdln.option('-l', '--limit-size', metavar='limit_size', @cmdln.option('-l', '--limit-size', metavar='limit_size',
help='Skip all files with a given size') help='Skip all files with a given size')
@cmdln.option('--native-obs-package', action='store_true',
help='Do not clone native scm repositories: Different representation and you will not be able to submit changes!')
@cmdln.alias('co') @cmdln.alias('co')
def do_checkout(self, subcmd, opts, *args): def do_checkout(self, subcmd, opts, *args):
""" """
@ -5103,7 +5105,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
prj_dir=project_dir, service_files=opts.source_service_files, prj_dir=project_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=opts.output_dir) meta=opts.meta, outdir=opts.output_dir, native_obs_package=opts.native_obs_package)
if os.isatty(sys.stdout.fileno()): if os.isatty(sys.stdout.fileno()):
print_request_list(apiurl, project, package) print_request_list(apiurl, project, package)
@ -5118,7 +5120,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
show_project_meta(apiurl, project) show_project_meta(apiurl, project)
scm_url = show_scmsync(apiurl, project) scm_url = show_scmsync(apiurl, project)
if scm_url is not None: if scm_url is not None and not opts.native_obs_package:
if not os.path.isfile('/usr/lib/obs/service/obs_scm_bridge'): if not os.path.isfile('/usr/lib/obs/service/obs_scm_bridge'):
raise oscerr.OscIOError(None, 'Install the obs-scm-bridge package to work on packages managed in scm (git)!') raise oscerr.OscIOError(None, 'Install the obs-scm-bridge package to work on packages managed in scm (git)!')
os.putenv("OSC_VERSION", get_osc_version()) os.putenv("OSC_VERSION", get_osc_version())
@ -5156,7 +5158,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) meta=opts.meta, native_obs_package=opts.native_obs_package)
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)
@ -5165,7 +5167,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) meta=opts.meta, native_obs_package=opts.native_obs_package)
if os.isatty(sys.stdout.fileno()): if os.isatty(sys.stdout.fileno()):
print_request_list(apiurl, project) print_request_list(apiurl, project)

3
osc/core.py
View File

@ -3091,6 +3091,7 @@ def checkout_package(
prj_dir: Path=None, prj_dir: Path=None,
server_service_files=None, server_service_files=None,
service_files=None, service_files=None,
native_obs_package=False,
progress_obj=None, progress_obj=None,
size_limit=None, size_limit=None,
meta=False, meta=False,
@ -3151,7 +3152,7 @@ def checkout_package(
meta_data = b''.join(show_package_meta(apiurl, project, package)) meta_data = b''.join(show_package_meta(apiurl, project, package))
root = ET.fromstring(meta_data) root = ET.fromstring(meta_data)
scmsync_element = root.find("scmsync") scmsync_element = root.find("scmsync")
if scmsync_element is not None and scmsync_element.text is not None: if not native_obs_package and scmsync_element is not None and scmsync_element.text is not None:
if not os.path.isfile('/usr/lib/obs/service/obs_scm_bridge'): if not os.path.isfile('/usr/lib/obs/service/obs_scm_bridge'):
raise oscerr.OscIOError(None, 'Install the obs-scm-bridge package to work on packages managed in scm (git)!') raise oscerr.OscIOError(None, 'Install the obs-scm-bridge package to work on packages managed in scm (git)!')
scm_url = scmsync_element.text scm_url = scmsync_element.text