From 4e148805da7bb1555e2a97b503a37c545000f997 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Fri, 22 Jan 2021 14:53:00 +0000
Subject: [PATCH] Fix parsing of .gitlab-deps
Remove a spurious match left over from previous commit.
---
gitlab_deps/deps.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gitlab_deps/deps.py b/gitlab_deps/deps.py
index b27a15c..945e621 100644
--- a/gitlab_deps/deps.py
+++ b/gitlab_deps/deps.py
@@ -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
--
GitLab