From 8d497e7b92bd0d4a800252ee6074d00fb6516d42 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 5 Jul 2017 13:45:41 -0400 Subject: [PATCH] Update ops now ignore changelog errors (#111) * Update ops now ignore changelog errors * >tabs * >still tabs * >tabs for days --- TGServerService/InterfaceBase.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/TGServerService/InterfaceBase.cs b/TGServerService/InterfaceBase.cs index 8179d2e688..e8ecc903ff 100644 --- a/TGServerService/InterfaceBase.cs +++ b/TGServerService/InterfaceBase.cs @@ -68,22 +68,16 @@ namespace TGServerService } GenerateChangelog(out res); - if (res != null) - return res; - - if (push_changelog_if_enabled && SSHAuth()) + if (res == null && push_changelog_if_enabled && SSHAuth()) { res = Commit(); - if (res != null) - return res; - res = Push(); - if (res != null) - return res; + if (res == null) + res = Push(); } if (!Compile(true)) return "Compilation could not be started!"; - return null; + return res; } catch (Exception e) {