From 27d113c61309f192d49af55bd11aeb3790d2c334 Mon Sep 17 00:00:00 2001 From: cuu Date: Sun, 27 May 2018 11:33:43 +0800 Subject: [PATCH] In Update,we use hard reset to update versions --- Menu/GameShell/10_Settings/Update/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Menu/GameShell/10_Settings/Update/__init__.py b/Menu/GameShell/10_Settings/Update/__init__.py index 8ad8216..0b4d73e 100644 --- a/Menu/GameShell/10_Settings/Update/__init__.py +++ b/Menu/GameShell/10_Settings/Update/__init__.py @@ -110,7 +110,7 @@ class UpdateConfirmPage(ConfirmPage): if event.key == CurKeys["B"]: if self._GIT == True: - cmdpath = "cd /home/cpi/apps/launcher ;git pull " + cmdpath = "cd /home/cpi/apps/launcher ;git pull; git reset --hard %s " % self._Version pygame.event.post( pygame.event.Event(RUNEVT, message=cmdpath)) self._GIT = False return @@ -286,7 +286,8 @@ class UpdatePage(Page): self._ConfirmPage._URL = None self._ConfirmPage._MD5 = None self._ConfirmPage._GIT = True - + self._ConfirmPage._Version = json_["gitversion"] + self._Screen.PushPage(self._ConfirmPage) self._Screen.Draw()