[12] check if system has git

pull/1282/head
meisnate12 2 years ago
parent f5993e36be
commit 25c877e8d3

@ -1 +1 @@
1.18.3-develop11 1.18.3-develop12

@ -6,7 +6,6 @@ from modules.logs import MyLogger
try: try:
import plexapi, requests, schedule import plexapi, requests, schedule
from git import Repo, InvalidGitRepositoryError
from PIL import ImageFile from PIL import ImageFile
from plexapi import server from plexapi import server
from plexapi.exceptions import NotFound from plexapi.exceptions import NotFound
@ -80,10 +79,13 @@ def get_arg(env_str, default, arg_bool=False, arg_int=False):
return str(final_value) return str(final_value)
else: else:
return default return default
try: try:
git_branch = Repo(path=".").head.ref.name from git import Repo, InvalidGitRepositoryError
except InvalidGitRepositoryError: try:
git_branch = Repo(path=".").head.ref.name
except InvalidGitRepositoryError:
git_branch = None
except ImportError:
git_branch = None git_branch = None
env_version = get_arg("BRANCH_NAME", "master") env_version = get_arg("BRANCH_NAME", "master")
is_docker = get_arg("PMM_DOCKER", False, arg_bool=True) is_docker = get_arg("PMM_DOCKER", False, arg_bool=True)

Loading…
Cancel
Save