|
|
@@ -1,4 +1,4 @@
|
|
1
|
|
-from asyncio import subprocess
|
|
|
1
|
+import subprocess
|
|
2
|
2
|
import tkinter
|
|
3
|
3
|
import json
|
|
4
|
4
|
import paramiko
|
|
|
@@ -165,8 +165,7 @@ button_confirm.pack()
|
|
165
|
165
|
if __name__ == "__main__":
|
|
166
|
166
|
check_git = subprocess.Popen(['git','merge','origin/alpha'], stdout=subprocess.PIPE, universal_newlines=True)
|
|
167
|
167
|
stdout, stderr = check_git.communicate()
|
|
168
|
|
- print(stdout)
|
|
169
|
|
- if stdout != "":
|
|
|
168
|
+ if (stdout != "Already up to date.\n"):
|
|
170
|
169
|
print('stdout not match')
|
|
171
|
170
|
pass
|
|
172
|
171
|
else:
|