Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2024-12-23 06:22:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make git error public, delete dir after clone

Browse Source
This commit is contained in:
rubenwardy 2018-06-05 19:47:02 +01:00
parent 9a36bb7d72
commit 8d9da5a750
No known key found for this signature in database
GPG Key ID: A1E29D52FF81513C
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/tasks/importtasks.py
View File

@ -15,7 +15,8 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
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")