Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2025-01-10 23:17:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix worker stopping due to gitpython asking for credentials

Browse Source
This commit is contained in:
rubenwardy 2018-06-07 22:32:17 +01:00
parent 051df7ab87
commit 40aac38d43
No known key found for this signature in database
GPG Key ID: A1E29D52FF81513C
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/tasks/importtasks.py
View File

@ -20,7 +20,7 @@ from git import GitCommandError
from flask.ext.sqlalchemy import SQLAlchemy from flask.ext.sqlalchemy import SQLAlchemy
from urllib.error import HTTPError from urllib.error import HTTPError
import urllib.request import urllib.request
from urllib.parse import urlparse, quote_plus from urllib.parse import urlparse, quote_plus, urlsplit
from app import app from app import app
from app.models import * from app.models import *
from app.tasks import celery, TaskError from app.tasks import celery, TaskError
@ -274,6 +274,10 @@ class PackageTreeNode:
def get(self, key): def get(self, key):
return self.meta.get(key) return self.meta.get(key)
def generateGitURL(urlstr):
scheme, netloc, path, query, frag = urlsplit(urlstr)
return "http://:@" + netloc + path + query
# Clones a repo from an unvalidated URL. # Clones a repo from an unvalidated URL.
# Returns a tuple of path and repo on sucess. # Returns a tuple of path and repo on sucess.
@ -284,7 +288,11 @@ def cloneRepo(urlstr, ref=None, recursive=False):
err = None err = None
try: try:
repo = git.Repo.clone_from(urlstr, gitDir, progress=None, env=None, depth=1, recursive=recursive) gitUrl = generateGitURL(urlstr)
print("Cloning from " + gitUrl)
repo = git.Repo.clone_from(gitUrl, gitDir, \
progress=None, env=None, depth=1, recursive=recursive, kill_after_timeout=15)
if ref is not None: if ref is not None:
repo.create_head("myhead", ref).checkout() repo.create_head("myhead", ref).checkout()
return gitDir, repo return gitDir, repo