catdog2/urlbot-native
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	eventlooper.py
This commit is contained in:
Dino
2014-08-10 00:32:44 +02:00
parent 762a2618bc 7fbc00d0cd
commit 9d8e5983a9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eventlooper.py
View File

@@ -224,7 +224,7 @@ def parse_delete(filepath):
os.remove(filepath) # probably better crash here os.remove(filepath) # probably better crash here
def print_version_git(): def print_version_git():
import subprocess, sys import subprocess
cmd = ['git', 'log', '-n', '1', '--oneline', '--abbrev-commit'] cmd = ['git', 'log', '-n', '1', '--oneline', '--abbrev-commit']
@@ -236,9 +236,9 @@ def print_version_git():
else: else:
print sys.argv[0] + " (unknown version)" print sys.argv[0] + " (unknown version)"
#print_version_git() if '__main__' == __name__:
print_version_git()
if __name__ == '__main__':
while 1: while 1:
try: try:
for f in os.listdir(event_files_dir): for f in os.listdir(event_files_dir):