Merge-o-Matic

Merge lp:~mwhudson/merge-o-matic/oops into lp:merge-o-matic

  1. oops
  2. Merge into trunk
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 318
Proposed branch: lp:~mwhudson/merge-o-matic/oops
Merge into: lp:merge-o-matic
Diff against target: 22 lines (+3/-3)
1 file modified
produce-merges.py (+3/-3)
To merge this branch: bzr merge lp:~mwhudson/merge-o-matic/oops
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+355485@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'produce-merges.py'
2--- produce-merges.py 2018-09-20 08:51:34 +0000
3+++ produce-merges.py 2018-09-21 09:40:30 +0000
4@@ -600,15 +600,15 @@
5 # between the ugo exec bits because it's hard to think of a reason we
6 # should.
7 mode = 0o644
8- if stat.S_IMODE(base_stat) & 0o111:
9+ if stat.S_IMODE(base_stat.st_mode) & 0o111:
10 # If base was executable and both left and right are, make output
11 # executable.
12- if stat.S_IMODE(right_stat) & stat.S_IMODE(left_stat) & 0o111:
13+ if stat.S_IMODE(right_stat.st_mode) & stat.S_IMODE(left_stat.st_mode) & 0o111:
14 mode |= 0o111
15 else:
16 # Alternatively, if base was not executable and either of left and right
17 # are, make output executable.
18- if (stat.S_IMODE(right_stat) | stat.S_IMODE(left_stat)) & 0o111:
19+ if (stat.S_IMODE(right_stat.st_mode) | stat.S_IMODE(left_stat.st_mode)) & 0o111:
20 mode |= 0o111
21
22 with open(dest, "w", mode) as output:

Subscribers

People subscribed via source and target branches

to status/vote changes: