From c950518da25890d5a9f30b1f18b7fb1cbe21f15e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 4 Jul 2013 12:18:24 +0530 Subject: [PATCH] Avoid unnecessary string formatting --- src/calibre/utils/filenames.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/utils/filenames.py b/src/calibre/utils/filenames.py index 54ce568539..d6193c068b 100644 --- a/src/calibre/utils/filenames.py +++ b/src/calibre/utils/filenames.py @@ -259,10 +259,10 @@ def samefile(src, dst): def windows_hardlink(src, dest): import win32file, pywintypes - msg = u'Creating hardlink from %s to %s failed: %%s' % (src, dest) try: win32file.CreateHardLink(dest, src) except pywintypes.error as e: + msg = u'Creating hardlink from %s to %s failed: %%s' % (src, dest) raise Exception(msg % e) # We open and close dest, to ensure its directory entry is updated # see http://blogs.msdn.com/b/oldnewthing/archive/2011/12/26/10251026.aspx @@ -273,6 +273,7 @@ def windows_hardlink(src, dest): win32file.CloseHandle(h) if sz != os.path.getsize(src): + msg = u'Creating hardlink from %s to %s failed: %%s' % (src, dest) raise Exception(msg % ('hardlink size: %d not the same as source size' % sz)) class WindowsAtomicFolderMove(object):