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

[Michael Hudson-Doyle]

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'produce-merges.py'
--- produce-merges.py	2018-09-20 08:51:34 +0000
+++ produce-merges.py	2018-09-21 09:40:30 +0000
@@ -600,15 +600,15 @@
     # between the ugo exec bits because it's hard to think of a reason we
     # should.
     mode = 0o644
-    if stat.S_IMODE(base_stat) & 0o111:
+    if stat.S_IMODE(base_stat.st_mode) & 0o111:
         # If base was executable and both left and right are, make output
         # executable.
-        if stat.S_IMODE(right_stat) & stat.S_IMODE(left_stat) & 0o111:
+        if stat.S_IMODE(right_stat.st_mode) & stat.S_IMODE(left_stat.st_mode) & 0o111:
             mode |= 0o111
     else:
         # Alternatively, if base was not executable and either of left and right
         # are, make output executable.
-        if (stat.S_IMODE(right_stat) | stat.S_IMODE(left_stat)) & 0o111:
+        if (stat.S_IMODE(right_stat.st_mode) | stat.S_IMODE(left_stat.st_mode)) & 0o111:
             mode |= 0o111
 
     with open(dest, "w", mode) as output: