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.

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

fix g.extension -l ValueError #1849

Merged
merged 1 commit into from
Sep 14, 2021
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions scripts/g.extension/g.extension.py
Original file line number Diff line number Diff line change
Expand Up @@ -2207,7 +2207,7 @@ def resolve_xmlurl_prefix(url, source=None):
'https://grass.osgeo.org/addons/'
"""
gscript.debug("resolve_xmlurl_prefix(url={0}, source={1})".format(url, source))
if source == "official":
if source in ("official", "official_fork"):
# use pregenerated modules XML file
# Define branch to fetch from (latest or current version)
version_branch = get_version_branch(version[0])
Expand Down Expand Up @@ -2391,7 +2391,7 @@ def resolve_source_code(url=None, name=None, branch=None, fork=False):
else:
svn_reference = "branches/{}".format(branch)

if not url:
if not url or url == GIT_URL:
# Set URL for the given GRASS version
git_url = f"{GIT_URL}/{svn_reference}/src/{module_class}/{name}"
return "official", git_url
Expand Down