Merge lp:~townsend/click/no-follow-symlinks into lp:click/devel

Proposed by Michael Vogt
Status: Merged
Merged at revision: 579
Proposed branch: lp:~townsend/click/no-follow-symlinks
Merge into: lp:click/devel
Diff against target: 29 lines (+4/-3)
2 files modified
click/install.py (+1/-1)
debian/changelog (+3/-2)
To merge this branch: bzr merge lp:~townsend/click/no-follow-symlinks
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+271646@code.launchpad.net

This proposal supersedes a proposal from 2015-09-17.

Commit message

Don't follow symlinks when stat()ing files.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote : Posted in a previous version of this proposal

Thanks, this looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/install.py'
2--- click/install.py 2014-12-03 12:42:21 +0000
3+++ click/install.py 2015-09-18 13:36:32 +0000
4@@ -418,7 +418,7 @@
5 for dirpath, dirnames, filenames in os.walk(inst_dir):
6 for entry in dirnames + filenames:
7 entry_path = os.path.join(dirpath, entry)
8- entry_mode = os.stat(entry_path).st_mode
9+ entry_mode = os.lstat(entry_path).st_mode
10 new_entry_mode = entry_mode | stat.S_IRGRP | stat.S_IROTH
11 if entry_mode & stat.S_IXUSR:
12 new_entry_mode |= stat.S_IXGRP | stat.S_IXOTH
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2015-07-02 09:45:22 +0000
16+++ debian/changelog 2015-09-18 13:36:32 +0000
17@@ -1,10 +1,11 @@
18-click (0.4.39.1-0ubuntu1) UNRELEASED; urgency=medium
19+click (0.4.39.1+15.10.20150702-0ubuntu1) wily; urgency=medium
20
21+ [ Michael Vogt ]
22 * lp:~mvo/click/lp1456328-15.10-devlibs:
23 - add ubuntu-sdk-15.10-dev1
24 - remove ubuntu-core-15.04-dev1
25
26- -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 02 Jul 2015 09:05:10 +0200
27+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 02 Jul 2015 11:43:15 +0000
28
29 click (0.4.39) vivid; urgency=low
30

Subscribers

People subscribed via source and target branches