Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
silver-platter
gitlab-deps
Commits
4e148805
Commit
4e148805
authored
Jan 22, 2021
by
ale
Browse files
Fix parsing of .gitlab-deps
Remove a spurious match left over from previous commit.
parent
5a52f6eb
Changes
1
Hide whitespace changes
Inline
Side-by-side
gitlab_deps/deps.py
View file @
4e148805
...
...
@@ -80,7 +80,7 @@ def get_explicit_deps(gl, project_path, branch_name):
return
[]
try
:
f
=
p
.
files
.
get
(
file_path
=
'.gitlab-deps'
,
ref
=
branch_name
)
return
f
.
decode
().
decode
(
'utf-8'
).
split
(
'
\n
'
)
return
not_null
(
f
.
decode
().
decode
(
'utf-8'
).
split
(
'
\n
'
)
)
except
Exception
:
return
[]
...
...
@@ -104,7 +104,7 @@ _url_rx = re.compile(r'^https?://[^/]+/([^:]+)(:(.*))?$')
def
url_to_project
(
url
,
gitlab_url
):
m
=
_url_rx
.
match
(
url
)
if
url
.
startswith
(
gitlab_url
)
and
m
and
m
[
1
]
==
gitlab_url
:
if
url
.
startswith
(
gitlab_url
)
and
m
:
return
m
[
1
],
m
[
3
]
or
DEFAULT_BRANCH
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment