From 0c1ea07589bd5e53aed37c693cf9e7d60811a7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozan=20=C3=87a=C4=9Flayan?= Date: Thu, 5 Feb 2009 07:40:20 +0000 Subject: [PATCH] * pisi/actionsapi/pisitools.py (dosed): Unlink backup file in all situations as it now raises warning instead of error. --- ChangeLog | 4 ++++ pisi/actionsapi/pisitools.py | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9aba1850..aa30561a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-02-05 Ozan Çağlayan + * pisi/actionsapi/pisitools.py (dosed): Unlink backup file in all situations + as it now raises warning instead of error. + 2009-02-04 Faik Uygur * Add --repository parameter to pisi upgrade operation to upgrade packages from only given repository (#6157) diff --git a/pisi/actionsapi/pisitools.py b/pisi/actionsapi/pisitools.py index 59bab213..c9afa0b9 100644 --- a/pisi/actionsapi/pisitools.py +++ b/pisi/actionsapi/pisitools.py @@ -212,8 +212,7 @@ def dosed(sourceFiles, findPattern, replacePattern = ''): # shallow=False tells cmp() to look file content. if filecmp.cmp(sourceFile, backupFile, shallow=False): ctx.ui.warning(_('dosed method has not changed file \'%s\'.') % sourceFile) - else: - os.unlink(backupFile) + os.unlink(backupFile) else: raise FileError(_('File does not exist or permission denied: %s') % sourceFile)