Skip to content

Commit 78e45b2

Browse files
committed
Fix order of tests when checking for already installed plugin
1 parent a614329 commit 78e45b2

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ test/fixtures/xml_files/file_protocol/minimal_plugin/
2525
.local
2626
.localconfig.mk
2727
/tmp
28+
/temp

qgis_plugin_manager/__main__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ def install_plugin(args: Namespace):
361361
echo.critical("Missing version")
362362
cli.exit(1)
363363
else:
364+
# No plugin version specified
364365
plugin_version = None
365366

366367
if plugin_info and not args.force:
@@ -371,13 +372,12 @@ def install_plugin(args: Namespace):
371372
if latest and latest.version == plugin_info.version:
372373
echo.alert(f"\t{plugin_name}=={plugin_info.version} is already at latest version")
373374
continue
374-
elif plugin_info.version == get_semver_version_str(plugin_version):
375-
echo.alert(f"\t{plugin_name}=={plugin_version} already installed")
376-
continue
377375
elif plugin_version is None:
378376
echo.alert(f"\t{plugin_name}=={plugin_info.version} already installed")
379377
continue
380-
378+
elif plugin_info.version == get_semver_version_str(plugin_version):
379+
echo.alert(f"\t{plugin_name}=={plugin_version} already installed")
380+
continue
381381
try:
382382
install_version = remote.install(
383383
plugin_name=plugin_name,

0 commit comments

Comments
 (0)