From 9aa1b1368a7888d97b128c28e0edf4ce4ffcbeb3 Mon Sep 17 00:00:00 2001 From: Steven Walter Date: Fri, 8 Aug 2008 09:13:36 -0400 Subject: [PATCH] clear_state: don't bail out if one of the files doesn't exist --- yap/yap.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/yap/yap.py b/yap/yap.py index 0622d6f..b281e23 100644 --- a/yap/yap.py +++ b/yap/yap.py @@ -327,12 +327,11 @@ class YapCore(object): def _clear_state(self): repo = get_output('git rev-parse --git-dir')[0] dir = os.path.join(repo, 'yap') - try: - os.unlink(os.path.join(dir, 'new-files')) - os.unlink(os.path.join(dir, 'merge')) - os.unlink(os.path.join(dir, 'msg')) - except OSError: - pass + for f in "new-files", "merge", "msg": + try: + os.unlink(os.path.join(dir, f)) + except OSError: + pass def _get_attr(self, name, attr): val = None -- 2.11.4.GIT