From 967e2fd4fe47001d572ddaf600720ecd18fa39c3 Mon Sep 17 00:00:00 2001 From: Esko Kokkonen Date: Sat, 26 Nov 2011 17:11:51 +0200 Subject: [PATCH] list_emerge_processes(): Don't exit the program, only return from the function Exiting the whole program at this early point is not always what we want. It is better to exit the function and resume the main function in case we want to do something else in the program. --- emerge-timer.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/emerge-timer.py b/emerge-timer.py index 739f8f4..2b2c818 100755 --- a/emerge-timer.py +++ b/emerge-timer.py @@ -366,7 +366,8 @@ def list_emerge_processes(): if len(PACKAGES) == 0: print "No current emerge process found." - sys.exit(0) + + return 1 for line in f: @@ -382,6 +383,8 @@ def list_emerge_processes(): if difference < p.emerge_time: p.emerge_time = difference + return 0 + def main(status, user_package=None): @@ -404,7 +407,8 @@ def main(status, user_package=None): elif status == "current": - list_emerge_processes() + if list_emerge_processes(): + return print "Currently emerging:" -- 2.45.0