Skip to content
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

Jump to bottom

[FIX] Current saas versioning #124

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FIX] Current saas versioning #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions anybox/recipe/odoo/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
logger = logging.getLogger(__name__)


MAJOR_VERSION_RE = re.compile(r'(\d+)[.](saas~|)(\d*)(\w*)')
MAJOR_VERSION_RE = re.compile(r'(saas~)?(\d+)[.](saas~|)(\d*)(\w*)')
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe it is good to add a paragraph of documentation about the new SaaS versions here



class WorkingDirectoryKeeper(object):
Expand Down Expand Up @@ -85,8 +85,8 @@ def major_version(version_string):
if m is None:
raise ValueError("Unparseable version string: %r" % version_string)

major = int(m.group(1))
minor = m.group(3)
major = int(m.group(2))
minor = m.group(4)
Copy link
Contributor

Choose a reason for hiding this comment

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

And a test for the new cases here


try:
return major, int(minor)
Expand Down