From 5eb37689ae2aac9d0a6aa10d72f14609d12dc985 Mon Sep 17 00:00:00 2001 From: AnInternetTroll Date: Sat, 27 Jun 2020 14:16:19 +0100 Subject: modified: cogs/admin.py modified: cogs/compiler.py --- .gitignore | 0 .vscode/settings.json | 0 bot.py | 0 cogs/admin.py | 5 ++++- cogs/compiler.py | 0 cogs/general.py | 0 cogs/help.py | 0 cogs/logs.py | 0 cogs/player.py | 0 cogs/src.py | 0 cogs/trans.py | 0 cogs/utils.py | 0 custom_commands.json | 0 main.py | 0 palette.png | Bin 15 files changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .vscode/settings.json mode change 100644 => 100755 bot.py mode change 100644 => 100755 cogs/compiler.py mode change 100644 => 100755 cogs/general.py mode change 100644 => 100755 cogs/help.py mode change 100644 => 100755 cogs/logs.py mode change 100644 => 100755 cogs/player.py mode change 100644 => 100755 cogs/src.py mode change 100644 => 100755 cogs/trans.py mode change 100644 => 100755 cogs/utils.py mode change 100644 => 100755 custom_commands.json mode change 100644 => 100755 main.py mode change 100644 => 100755 palette.png diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.vscode/settings.json b/.vscode/settings.json old mode 100644 new mode 100755 diff --git a/bot.py b/bot.py old mode 100644 new mode 100755 diff --git a/cogs/admin.py b/cogs/admin.py index 67ffa4c..6c15e5e 100644 --- a/cogs/admin.py +++ b/cogs/admin.py @@ -32,7 +32,10 @@ class Admin(commands.Cog): @commands.check(is_mod) async def pull(self, ctx): g = git.cmd.Git(os.getcwd()) - await ctx.send(f"Probably pulled.\n```bash\n{g.pull()}```") + try: + await ctx.send(f"Probably pulled.\n```bash\n{g.pull()}```") + except git.exc.GitCommandError as e: + await ctx.send(f"An error has occured when pulling```bash\n{e}```") @commands.command(aliases=['addcommand', 'newcommand']) @commands.check(is_mod) diff --git a/cogs/compiler.py b/cogs/compiler.py old mode 100644 new mode 100755 diff --git a/cogs/general.py b/cogs/general.py old mode 100644 new mode 100755 diff --git a/cogs/help.py b/cogs/help.py old mode 100644 new mode 100755 diff --git a/cogs/logs.py b/cogs/logs.py old mode 100644 new mode 100755 diff --git a/cogs/player.py b/cogs/player.py old mode 100644 new mode 100755 diff --git a/cogs/src.py b/cogs/src.py old mode 100644 new mode 100755 diff --git a/cogs/trans.py b/cogs/trans.py old mode 100644 new mode 100755 diff --git a/cogs/utils.py b/cogs/utils.py old mode 100644 new mode 100755 diff --git a/custom_commands.json b/custom_commands.json old mode 100644 new mode 100755 diff --git a/main.py b/main.py old mode 100644 new mode 100755 diff --git a/palette.png b/palette.png old mode 100644 new mode 100755 -- cgit v1.2.3