Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package opi for openSUSE:Factory checked in
at 2023-09-26 22:01:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opi (Old)
and /work/SRC/openSUSE:Factory/.opi.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opi"
Tue Sep 26 22:01:27 2023 rev:48 rq:1113461 version:3.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/opi/opi.changes 2023-08-31 13:52:05.797902554
+0200
+++ /work/SRC/openSUSE:Factory/.opi.new.1770/opi.changes 2023-09-26
22:04:51.083296760 +0200
@@ -1,0 +2,9 @@
+Mon Sep 25 13:23:21 UTC 2023 - Dominik Heidler <dheid...@suse.de>
+
+- Version 3.5.0
+- Expand releasever for local repo names
+- Make resilio comment shorter
+- Add option to skip plugins
+- Update repo URL for MEGASync
+
+-------------------------------------------------------------------
Old:
----
opi-3.4.0.tar.gz
New:
----
opi-3.5.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opi.spec ++++++
--- /var/tmp/diff_new_pack.rC4ahg/_old 2023-09-26 22:04:52.083332871 +0200
+++ /var/tmp/diff_new_pack.rC4ahg/_new 2023-09-26 22:04:52.087333016 +0200
@@ -17,7 +17,7 @@
Name: opi
-Version: 3.4.0
+Version: 3.5.0
Release: 0
Summary: OBS Package Installer (CLI)
License: GPL-3.0-only
++++++ opi-3.4.0.tar.gz -> opi-3.5.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/opi-3.4.0/bin/opi new/opi-3.5.0/bin/opi
--- old/opi-3.4.0/bin/opi 2023-08-30 15:32:26.000000000 +0200
+++ new/opi-3.5.0/bin/opi 2023-09-25 15:23:16.000000000 +0200
@@ -49,7 +49,7 @@
'''),
epilog=textwrap.dedent('''\
- Also these queries can be used to install packages from
various other vendors:
+ Also these queries (provided by plugins) can be used to
install packages from various other vendors:
''') + pm.get_plugin_string(' ' * 2))
ap.add_argument('query', nargs='*', type=str, help=textwrap.dedent('''\
@@ -58,6 +58,7 @@
'''))
ap.add_argument('-v', '--version', action='version', version=f'opi
version {__version__}')
ap.add_argument('-n', dest='non_interactive', action='store_true',
help="Run in non interactive mode")
+ ap.add_argument('-P', dest='no_plugins', action='store_true',
help="Don't run any plugins - only search repos, OBS and Packman")
args = ap.parse_args()
@@ -72,8 +73,9 @@
print(' or sudo must not require interaction.')
sys.exit(1)
- # Try to find a matching plugin for the query (and run it and exit
afterwards)
- pm.run(args.query[0])
+ if not args.no_plugins:
+ # Try to find a matching plugin for the query (and run it and
exit afterwards)
+ pm.run(args.query[0])
binaries = []
binaries.extend(opi.search_published_binary('openSUSE', args.query))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/opi-3.4.0/opi/__init__.py
new/opi-3.5.0/opi/__init__.py
--- old/opi-3.4.0/opi/__init__.py 2023-08-30 15:32:26.000000000 +0200
+++ new/opi-3.5.0/opi/__init__.py 2023-09-25 15:23:16.000000000 +0200
@@ -82,6 +82,9 @@
version = os_release.get('VERSION') # VERSION is not set for TW
return version
+def expand_releasever(s: str) -> str:
+ return s.replace('$releasever', get_version() or '$releasever')
+
###############
### PACKMAN ###
###############
@@ -153,7 +156,7 @@
# 104 ZYPPER_EXIT_INF_CAP_NOT_FOUND is returned if
there are no results
raise
- repos_by_name = {repo['name']: repo for repo in get_repos()}
+ repos_by_name = {expand_releasever(repo['name']): repo for repo in
get_repos()}
local_installables = []
for repo_name, installables in search_results.items():
try:
@@ -175,7 +178,7 @@
return local_installables
def url_normalize(url):
- return re.sub(r'^https?', '', url).rstrip('/').replace('$releasever',
get_version() or '$releasever')
+ return expand_releasever(re.sub(r'^https?', '', url).rstrip('/'))
def get_repos():
for repo_file in os.listdir(REPO_DIR):
@@ -472,7 +475,7 @@
existing_repo = get_enabled_repo_by_url(url)
if existing_repo:
# Install from existing repos (don't add a repo)
- print(f"Installing from existing repo
'{existing_repo['name']}'")
+ print(f"Installing from existing repo
'{expand_releasever(existing_repo['name'])}'")
# ensure that this repo is up to date if no
auto_refresh is configured
if not existing_repo['auto_refresh']:
refresh_repos(existing_repo['alias'])
@@ -562,7 +565,7 @@
return options[num - 1]
def ask_import_key(keyurl):
- keys = requests.get(keyurl.replace('$releasever', get_version() or
'$releasever')).text
+ keys = requests.get(expand_releasever(keyurl)).text
db_keys = get_keys_from_rpmdb()
for key in split_keys(keys):
for line in subprocess.check_output(['gpg', '--quiet',
'--show-keys', '--with-colons', '-'],
input=key.encode()).decode().strip().split('\n'):
@@ -583,7 +586,7 @@
Ask to remove the key given by url to key file.
Warns about all repos still using the key except the repo given
by repo_name param.
"""
- urlkeys = split_keys(requests.get(keyurl.replace('$releasever',
get_version() or '$releasever')).text)
+ urlkeys = split_keys(requests.get(expand_releasever(keyurl)).text)
urlkeys_normalized = [normalize_key(urlkey) for urlkey in urlkeys]
db_keys = get_keys_from_rpmdb()
keys_to_ask_user = [key for key in db_keys if key['pubkey'] in
urlkeys_normalized]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/opi-3.4.0/opi/plugins/megasync.py
new/opi-3.5.0/opi/plugins/megasync.py
--- old/opi-3.4.0/opi/plugins/megasync.py 2023-08-30 15:32:26.000000000
+0200
+++ new/opi-3.5.0/opi/plugins/megasync.py 2023-09-25 15:23:16.000000000
+0200
@@ -16,8 +16,8 @@
opi.add_repo(
filename = 'megasync',
name = 'MEGAsync',
- url =
'https://mega.nz/linux/MEGAsync/openSUSE_Tumbleweed/',
- gpgkey =
'https://mega.nz/linux/MEGAsync/openSUSE_Tumbleweed/repodata/repomd.xml.key'
+ url = 'https://mega.nz/linux/repo/openSUSE_Tumbleweed/',
+ gpgkey =
'https://mega.nz/linux/repo/openSUSE_Tumbleweed/repodata/repomd.xml.key'
)
packages = ['megasync']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/opi-3.4.0/opi/plugins/resilio-sync.py
new/opi-3.5.0/opi/plugins/resilio-sync.py
--- old/opi-3.4.0/opi/plugins/resilio-sync.py 2023-08-30 15:32:26.000000000
+0200
+++ new/opi-3.5.0/opi/plugins/resilio-sync.py 2023-09-25 15:23:16.000000000
+0200
@@ -3,7 +3,7 @@
class ResilioSync(BasePlugin):
main_query = 'resilio-sync'
- description = 'Resilio Sync decentralized file synchronization between
devices using the bittorrent protocol'
+ description = 'Decentralized file synchronization between devices using
bittorrent protocol'
queries = ['resilio-sync', 'resilio', 'rslsync']
@classmethod
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/opi-3.4.0/opi/version.py new/opi-3.5.0/opi/version.py
--- old/opi-3.4.0/opi/version.py 2023-08-30 15:32:26.000000000 +0200
+++ new/opi-3.5.0/opi/version.py 2023-09-25 15:23:16.000000000 +0200
@@ -1 +1 @@
-__version__ = '3.4.0'
+__version__ = '3.5.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/opi-3.4.0/opi.changes new/opi-3.5.0/opi.changes
--- old/opi-3.4.0/opi.changes 2023-08-30 15:32:26.000000000 +0200
+++ new/opi-3.5.0/opi.changes 2023-09-25 15:23:16.000000000 +0200
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Mon Sep 25 13:23:05 UTC 2023 - Dominik Heidler <dheid...@suse.de>
+
+- Version 3.5.0
+- Expand releasever for local repo names
+- Make resilio comment shorter
+- Add option to skip plugins
+- Update repo URL for MEGASync
+
+-------------------------------------------------------------------
Wed Aug 30 13:32:14 UTC 2023 - Dominik Heidler <dheid...@suse.de>
- Version 3.4.0
