Unverified Commit 5409925d authored by Martin Weinelt's avatar Martin Weinelt
Browse files

botamusique: Backport fix for invalid version handling

parent d048d75e
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
diff --git a/mumbleBot.py b/mumbleBot.py
index 11bc480..7395f41 100644
--- a/mumbleBot.py
+++ b/mumbleBot.py
@@ -188,11 +188,14 @@ class MumbleBot:
             th.start()
 
         last_startup_version = var.db.get("bot", "version", fallback=None)
-        if not last_startup_version or version.parse(last_startup_version) < version.parse(self.version):
-            var.db.set("bot", "version", self.version)
-            if var.config.getboolean("bot", "auto_check_update"):
-                changelog = util.fetch_changelog()
-                self.send_channel_msg(tr("update_successful", version=self.version, changelog=changelog))
+        try:
+            if not last_startup_version or version.parse(last_startup_version) < version.parse(self.version):
+                var.db.set("bot", "version", self.version)
+                if var.config.getboolean("bot", "auto_check_update"):
+                    changelog = util.fetch_changelog()
+                    self.send_channel_msg(tr("update_successful", version=self.version, changelog=changelog))
+        except version.InvalidVersion:
+            pass
 
     # Set the CTRL+C shortcut
     def ctrl_caught(self, signal, frame):
+6 −0
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, python3Packages
, ffmpeg
, makeWrapper
@@ -53,6 +54,11 @@ stdenv.mkDerivation rec {
    # We can't update the package at runtime with NixOS, so this patch makes
    # the !update command mention that
    ./no-runtime-update.patch

    # Fix passing of invalid "git" version into version.parse, which results
    # in an InvalidVersion exception. The upstream fix is insufficient, so
    # we carry the correct patch downstream for now.
    ./catch-invalid-versions.patch
  ];

  postPatch = ''