mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-26 22:56:15 +01:00
Code

Merge pull request #1062 from adrianschroeter/gitupdate

Browse Source 
fix crash on "osc up" for git based package/projects
This commit is contained in:
Daniel Mach 2022-06-24 08:53:42 +02:00 committed by GitHub
commit 9a5c775d47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osc/commandline.py
View File

@ -5176,6 +5176,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
for arg in arg_list: for arg in arg_list:
if is_project_dir(arg): if is_project_dir(arg):
prj = Project(arg, progress_obj=self.download_progress) prj = Project(arg, progress_obj=self.download_progress)
if prj.scm_url:
print("Please use git to update project", prj.name)
continue
if conf.config['do_package_tracking']: if conf.config['do_package_tracking']:
prj.update(expand_link=opts.expand_link, prj.update(expand_link=opts.expand_link,
@ -5237,6 +5240,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
# 'copy has local modifications.\nPlease revert/commit them ' \ # 'copy has local modifications.\nPlease revert/commit them ' \
# 'and try again.' # 'and try again.'
# sys.exit(1) # sys.exit(1)
if p.scm_url:
print("Please use git to update package", p.name)
continue
if not rev: if not rev:
if opts.expand_link: if opts.expand_link:
@ -9332,7 +9338,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
opts.no_echo = True opts.no_echo = True
opts.prompt = True opts.prompt = True
opts.select_password_store = True opts.select_password_store = True
prompt_value = 'Password: ' prompt_value = 'Password : '
if len(args) != 1: if len(args) != 1:
raise oscerr.WrongArgs('--change-password only needs the apiurl') raise oscerr.WrongArgs('--change-password only needs the apiurl')
args = [args[0], 'pass'] args = [args[0], 'pass']