From 9291324866c45b5cfdabea017fded13e42c3e2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 19 Jun 2006 13:30:11 +0000 Subject: [PATCH] =?UTF-8?q?Ayn=C4=B1=20commit=20mesaj=C4=B1nda=20yazd?= =?UTF-8?q?=C4=B1=C4=9F=C4=B1=20gibi;=20"don't=20ask=20me=20why=20it=20too?= =?UTF-8?q?k=20this=20many=20changes.=20all=20tested=20well."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Geri-iz: File "/usr/bin/pisi", line 84, in ? cli.run_command() File "/usr/lib/pardus/pisi/cli/pisicli.py", line 111, in run_command self.command.run() File "/usr/lib/pardus/pisi/cli/commands.py", line 534, in run pisi.api.install(self.args, ctx.get_option('reinstall')) File "/usr/lib/pardus/pisi/operations.py", line 67, in install return install_pkg_files(packages) File "/usr/lib/pardus/pisi/operations.py", line 173, in install_pkg_files atomicoperations.install_single_file(dfn[x]) File "/usr/lib/pardus/pisi/atomicoperations.py", line 406, in install_single_file Install(pkg_location).install(not upgrade) File "/usr/lib/pardus/pisi/atomicoperations.py", line 109, in install self.extract_install() File "/usr/lib/pardus/pisi/atomicoperations.py", line 296, in extract_install if (os.path.isfile(fpath) or os.path.islink(fpath)) and os.path.exists(fpath) and pisi.util.sha1_file(fpath) == fileinfo.hash: File "/usr/lib/pardus/pisi/util.py", line 463, in sha1_file raise FileError(_("I/O Error: Cannot calculate SHA1 hash of %s") % filename) DEBUG: PISI API finalized --- pisi/atomicoperations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index a62da97c..32a7f759 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -293,7 +293,7 @@ class Install(AtomicOperation): assert newf.path == oldf.path if newf.type == 'config' and oldf.type == 'config': # config upgrade fpath = pisi.util.join_path(ctx.config.dest_dir(), oldf.path) - if (os.path.isfile(fpath) or os.path.islink(fpath)) and os.path.exists(fpath) and pisi.util.sha1_file(fpath) == fileinfo.hash: + if (os.path.isfile(fpath) or os.path.islink(fpath) and not os.path.isdir(fpath)) and os.path.exists(fpath) and pisi.util.sha1_file(fpath) == fileinfo.hash: # old config file changed, don't overwrite config_changed.append(fpath) if os.path.exists(fpath + '.old'):