From f5005bb796bd490739bf2cd4c113e86cd7ae6c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Sun, 28 Feb 2010 19:00:36 +0000 Subject: [PATCH] Take -D parameter into account when looking for file permission changes --- ChangeLog | 2 ++ pisi/operations/delta.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 78fd2e34..7d448dca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ * pisi/operations/check.py: Show missing files in the "check" command output. Take "-D" parameter into account when checking files. + * pisi/operations/delta.py: Take -D parameter into account + when looking for file permission changes. 2010-02-27 Fatih Aşıcı * pisi/archive.py: Install files into correct paths when the old diff --git a/pisi/operations/delta.py b/pisi/operations/delta.py index c8cba09e..01cba96c 100644 --- a/pisi/operations/delta.py +++ b/pisi/operations/delta.py @@ -157,7 +157,7 @@ def find_permission_changes(oldfiles, newfiles): permissions = [] for h in unchanged: for _file in files_new[h]: - path = "/%s" % _file.path + path = os.path.join(ctx.config.dest_dir(), _file.path) if os.path.exists(path) and oct(stat.S_IMODE(os.stat(path)[stat.ST_MODE])) != _file.mode: permissions.append((path, int(_file.mode, 8)))