CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-07 19:58:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Downloader] Disable git interaction, fix tab split (#673)

Browse Source
This commit is contained in:
Caleb Johnson 2017-03-22 08:41:00 -05:00 committed by Twentysix
parent 7c192b3668
commit 39ab99ee44
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cogs/downloader.py
View File

@ -4,7 +4,7 @@ from cogs.utils import checks
from cogs.utils.chat_formatting import pagify, box from cogs.utils.chat_formatting import pagify, box
from __main__ import send_cmd_help, set_cog from __main__ import send_cmd_help, set_cog
import os import os
from subprocess import run, PIPE from subprocess import run as sp_run, PIPE
import shutil import shutil
from asyncio import as_completed from asyncio import as_completed
from setuptools import distutils from setuptools import distutils
@ -351,7 +351,7 @@ class Downloader:
"--reverse", oldhash + '..', cogfile "--reverse", oldhash + '..', cogfile
] ]
try: try:
log = run(cmd, stdout=PIPE).stdout.decode().strip() log = sp_run(cmd, stdout=PIPE).stdout.decode().strip()
yield self.format_patch(repo, cog, log) yield self.format_patch(repo, cog, log)
except: except:
pass pass
@ -557,6 +557,13 @@ class Downloader:
del self.repos[name][cog] del self.repos[name][cog]
def update_repo(self, name): def update_repo(self, name):
def run(*args, **kwargs):
env = os.environ.copy()
env['GIT_TERMINAL_PROMPT'] = '0'
kwargs['env'] = env
return sp_run(*args, **kwargs)
try: try:
dd = self.path dd = self.path
if name not in self.repos: if name not in self.repos:
@ -606,18 +613,24 @@ class Downloader:
cmd = ['git', '-C', dd + name, 'diff', '--no-commit-id', cmd = ['git', '-C', dd + name, 'diff', '--no-commit-id',
'--name-status', oldhash, newhash] '--name-status', oldhash, newhash]
p = run(cmd, stdout=PIPE) p = run(cmd, stdout=PIPE)
if p.returncode != 0: if p.returncode != 0:
raise UpdateError("Error in git diff") raise UpdateError("Error in git diff")
changed = p.stdout.strip().decode().split('\n') changed = p.stdout.strip().decode().split('\n')
for f in changed: for f in changed:
if not f.endswith('.py'): if not f.endswith('.py'):
continue continue
status, cogpath = f.split('\t')
status, _, cogpath = f.partition('\t')
cogname = os.path.split(cogpath)[-1][:-3] # strip .py cogname = os.path.split(cogpath)[-1][:-3] # strip .py
if status not in ret: if status not in ret:
ret[status] = [] ret[status] = []
ret[status].append(cogname) ret[status].append(cogname)
return name, ret, oldhash return name, ret, oldhash
except CloningError as e: except CloningError as e:
raise CloningError(name, *e.args) from None raise CloningError(name, *e.args) from None
except UpdateError as e: except UpdateError as e: