From d5e0d569024805e42039955f2e38024fcfdb0f7b Mon Sep 17 00:00:00 2001 From: keby Date: Thu, 20 May 2010 22:53:29 +0200 Subject: [PATCH 1/1] fixing a bug when a page is blanked --- src/mw/clicommands.py | 2 +- src/mw/metadir.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py index 4ecafb0..6db3cb8 100644 --- a/src/mw/clicommands.py +++ b/src/mw/clicommands.py @@ -232,7 +232,7 @@ class CommitCommand(CommandBase): filename = os.path.join(self.metadir.root, file) text = codecs.open(filename, 'r', 'utf-8').read() text = text.encode('utf-8') - if text[-1] == '\n': + if (len(text) != 0) and (text[-1] == '\n'): text = text[:-1] md5 = hashlib.md5() md5.update(text) diff --git a/src/mw/metadir.py b/src/mw/metadir.py index 2954819..9aae091 100644 --- a/src/mw/metadir.py +++ b/src/mw/metadir.py @@ -155,7 +155,7 @@ class Metadir(object): rvid = self.pages_get_rv_list(pageid)[-1] rv = self.pages_get_rv(pageid, rvid) cur_content = codecs.open(full, 'r', 'utf-8').read() - if cur_content[-1] == '\n': + if (len(cur_content) != 0) and (cur_content[-1] == '\n'): cur_content = cur_content[:-1] if cur_content != rv['content']: status[os.path.relpath(full, self.root)] = 'U' @@ -176,7 +176,7 @@ class Metadir(object): old = [i + '\n' for i in oldrv['content'].split('\n')] if newrvid == 0: cur_content = codecs.open(filename, 'r', 'utf-8').read() - if cur_content[-1] == '\n': + if (len(cur_content) != 0) and (cur_content[-1] == '\n'): cur_content = cur_content[:-1] newname = 'b/%s (working copy)' % filename new = [i + '\n' for i in cur_content.split('\n')] -- 2.39.5