From bdfe232b8a269e5f63806bbdb7a3d8edf6b2ee7a Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Thu, 22 Mar 2007 08:30:18 +0000 Subject: Quick pactest changes: * Minor change to utils.py(grep) to make it cleaner * Added scriptlet check to verify scriptlet events happen --- pactest/util.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'pactest/util.py') diff --git a/pactest/util.py b/pactest/util.py index e445605e..574a59be 100755 --- a/pactest/util.py +++ b/pactest/util.py @@ -236,16 +236,12 @@ def diffmtime(mt1, mt2): # def grep(filename, pattern): - found = 0 - fd = file(filename, "r") - while 1 and not found: - line = fd.readline() - if not line: - break + lines = file(filename, 'r').readlines() + for line in lines: + if not line: break if line.find(pattern) != -1: - found = 1 - fd.close() - return found + return True + return False def mkdir(dir): if os.path.isdir(dir): -- cgit v1.2.3-24-g4f1b