-
Notifications
You must be signed in to change notification settings - Fork 20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor code #136
Refactor code #136
Conversation
There is a merge commit in the list of commits - maybe you can get rid if that one. |
Okay. Then I'll undo the last 3 commits and resolve your comments (in a few hours). |
This should resolve the merge conflicts. I've done it this way, because you didn't want to have a Merge commit. opi/__init__.py1. 'alias': mainsec,
'filename': re.sub(r'\.repo$', '', repo_file),
'name': cp[mainsec].get('name', mainsec),
'url': cp.get(mainsec, 'baseurl'),
}
if cp.has_option(mainsec, 'gpgkey'):
repo['gpgkey'] = cp.get(mainsec, 'gpgkey') 2. if binary['obs_instance'] == 'LOCAL_REPO':
existing_repo = repository
else:
repo_alias = project.replace(':', '_')
project_path = project.replace(':', ':/')
if config.get_key_from_config('use_releasever_var'):
version = get_version()
if version:
# version is None on tw
repository = repository.replace(version, '$releasever')
url = f'https://download.opensuse.org/repositories/{project_path}/{repository}/'
gpgkey = url + 'repodata/repomd.xml.key'
existing_repo = get_enabled_repo_by_url(url) 3. print('This key is still in use by the following remaining repos - removal is NOT recommended:')
print(' - ' + '\n - '.join([repo['filename'] for repo in repos_using_this_key])) 4. if not ask_yes_or_no(f"Do you want to keep the repo '{repo}'?"):
repo_info = next((r for r in get_repos() if r['filename'] == repo)) 5. if binary['obs_instance'] not in ('openSUSE', 'LOCAL_REPO'):
project = f"{binary['obs_instance']} {project}" opi/plugins/zoom.py1. key_url = 'https://zoom.us/linux/download/pubkey?version=5-12-6' |
Could you resolve that merge conflicts by running |
Co-authored-by: asdil12 <dheidler@suse.de>
Co-authored-by: Dominik Heidler <dominik@heidler.eu>
Co-authored-by: Dominik Heidler <dominik@heidler.eu>
It's probably the easiest to read the
diff
of the individual commits instead of comparing everything at once.The commit names should be reasonably accurate in describing what was changed.
Here is a rough summary of the changes:
'
as main quotation markaction
option with default on'in'
toinstall_packages
for code reusing (maybe change function name?)