When killing lyx instances, we may ignore failures of kill and killall (if the process is not found, it exited already).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37734 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Tommaso Cucinotta 2011-02-19 21:00:01 +00:00
parent 7f6903f6db
commit 1b929a0c45

View File

@ -321,9 +321,9 @@ while not failed:
lyx_pid=os.popen("pidof lyx").read()
if lyx_pid != "":
print "Found running instance(s) of LyX: " + lyx_pid + ": killing them all\n"
intr_system("killall lyx")
intr_system("killall lyx", True)
time.sleep(0.5)
intr_system("killall -KILL lyx")
intr_system("killall -KILL lyx", True)
time.sleep(0.2)
print "Starting LyX . . ."
if lyx_userdir is None:
@ -376,7 +376,7 @@ while not failed:
elif c[0:7] == 'TestEnd':
time.sleep(0.5)
print "Terminating lyx instance: " + str(lyx_pid) + "\n"
intr_system("kill -9 " + str(lyx_pid));
intr_system("kill -9 " + str(lyx_pid), True);
while lyx_exists():
print "Waiting for lyx to die...\n"
time.sleep(0.5)