From 8d9da5a75034bc9af48a90294f5bec2776829a0f Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Tue, 5 Jun 2018 19:47:02 +0100 Subject: [PATCH] Make git error public, delete dir after clone --- app/tasks/importtasks.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app/tasks/importtasks.py b/app/tasks/importtasks.py index c39a008d..c2460d24 100644 --- a/app/tasks/importtasks.py +++ b/app/tasks/importtasks.py @@ -15,7 +15,8 @@ # along with this program. If not, see . -import flask, json, os, git, tempfile +import flask, json, os, git, tempfile, shutil +from git import GitCommandError from flask.ext.sqlalchemy import SQLAlchemy from urllib.error import HTTPError import urllib.request @@ -246,10 +247,23 @@ def getMeta(urlstr, author): url = urlparse(urlstr) gitDir = tempfile.gettempdir() + "/" + randomString(10) - git.Repo.clone_from(urlstr, gitDir, progress=None, env=None, depth=1) + + err = None + + try: + git.Repo.clone_from(urlstr, gitDir, progress=None, env=None, depth=1) + except GitCommandError as e: + err = e.stderr + + if err is not None: + raise TaskError(err.replace("stderr: ", "") \ + .replace("Cloning into '" + gitDir + "'...", "") \ + .strip()) tree = PackageTreeNode(gitDir, author=author, repo=urlstr) + shutil.rmtree(gitDir) + result = {} result["name"] = tree.name result["provides"] = tree.fold("name")