From 6b2ad6a58a66e11aa4a0e4fd4c7d47e53bba640f Mon Sep 17 00:00:00 2001 From: cuu Date: Sun, 27 May 2018 11:45:20 +0800 Subject: [PATCH] fix git reset hard version control tangle --- Menu/GameShell/10_Settings/Update/__init__.py | 6 ++++-- sys.py/UI/util_funcs.py | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Menu/GameShell/10_Settings/Update/__init__.py b/Menu/GameShell/10_Settings/Update/__init__.py index 0b4d73e..d3f513f 100644 --- a/Menu/GameShell/10_Settings/Update/__init__.py +++ b/Menu/GameShell/10_Settings/Update/__init__.py @@ -14,7 +14,7 @@ from UI.icon_item import IconItem from UI.icon_pool import MyIconPool from UI.label import Label from UI.fonts import fonts -from UI.util_funcs import midRect,CmdClean +from UI.util_funcs import midRect,CmdClean,get_git_revision_short_hash from UI.keys_def import CurKeys from UI.confirm_page import ConfirmPage from UI.download import Download @@ -282,7 +282,9 @@ class UpdatePage(Page): self._Screen.SwapAndShow() elif "gitversion" in json_: ### just use git to run update - if config.VERSION != json_["gitversion"]: + current_git_version = get_git_revision_short_hash() + + if current_git_version != json_["gitversion"]: self._ConfirmPage._URL = None self._ConfirmPage._MD5 = None self._ConfirmPage._GIT = True diff --git a/sys.py/UI/util_funcs.py b/sys.py/UI/util_funcs.py index d08764e..a15d523 100644 --- a/sys.py/UI/util_funcs.py +++ b/sys.py/UI/util_funcs.py @@ -2,6 +2,7 @@ import pygame import os +import subprocess #from libs import easing #from datetime import datetime @@ -11,6 +12,14 @@ import os import string from Xlib import X,display + +def get_git_revision_hash(): + return subprocess.check_output(['git', 'rev-parse', 'HEAD']) + +def get_git_revision_short_hash(): + return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']) + + def X_center_mouse(): d = display.Display() s = d.screen()