Skip to content

SG-36291 Do not downgrade startup versions #131

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.

Sign up for GitHub

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

Open
julien-lang wants to merge 3 commits into
base: master
Choose a base branch
from
Open

SG-36291 Do not downgrade startup versions #131

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d07ab8
WIP
julien-lang Sep 13, 2024
5330439
Finalize the change
julien-lang Sep 18, 2024
dfb910b
Add environment variable to override the behavior
julien-lang Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions python/shotgun_desktop/upgrade_startup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,34 @@ def _out_of_date_check(latest_descriptor, current_desc):
% current_desc.get_version(),
)
return False

# Test if app_store version is lower than the current version
try:
import packaging.version

current_version = packaging.version.parse(current_desc.get_version())
app_store_version = packaging.version.parse(latest_descriptor.get_version())
except ImportError:
logger.exception("Could not import packaging module")
except packaging.version.InvalidVersion:
logger.warning(
"Could not parse version(s) %s/%s",
current_desc.get_version(),
latest_descriptor.get_version(),
)
else:
if current_version <= app_store_version:
pass
elif os.environ.get("SGTK_STARTUP_ALLOW_OLDER_VERSION"):
pass
else:
logger.warning(
"Ignore app_store version %s since current version is newer %s",
latest_descriptor.version,
current_desc.get_version(),
)
return False
Comment on lines +75 to +85
Copy link
Contributor

@carlos-villavicencio-adsk carlos-villavicencio-adsk Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested it but can it be rewritten like this?

Suggested change
if current_version <= app_store_version:
pass
elif os.environ.get("SGTK_STARTUP_ALLOW_OLDER_VERSION"):
pass
else:
logger.warning(
"Ignore app_store version %s since current version is newer %s",
latest_descriptor.version,
current_desc.get_version(),
)
return False
if os.environ.get("SGTK_STARTUP_ALLOW_OLDER_VERSION"):
pass
elif current_version > app_store_version:
logger.warning(
"Ignore app_store version %s since current version is newer %s",
latest_descriptor.version,
current_desc.get_version(),
)
return False

Copy link
Contributor Author

@julien-lang julien-lang Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think both are equivalent. I wrote it this way because that would be easy to add logs later if needed.
Also I find it easier to read but it's a personal preference.


return latest_descriptor.get_version() != current_desc.get_version()


Expand Down