Merge branch 'stable' into beta

CHANGELOG.md

@@ -9,9 +9,10 @@ The table below shows which release corresponds to each branch, and what date th
 
 | Version          | Branch   | Release Date           |
 | ---------------- | -------- | ---------------------- |
-| [4.7.0](#470)    | `dev`    | May 29, 2020 (planned)
-| [4.6.0](#460)    | `beta`   | May 29, 2020 (planned)
-| [4.5.0](#450)    | `stable` | Apr 30, 2020
+| [4.7.0](#470)    | `dev`    |
+| [4.6.0](#460)    | `beta`   |
+| [4.5.1](#451)    | `stable` | May 30, 2020
+| [4.5.0](#450)    |          | Apr 30, 2020
 | [4.4.0](#440)    |          | Mar 29, 2020
 | [4.3.1](#431)    |          | Nov 29, 2020
 | [4.3.0](#430)    |          | Oct 20, 2020
@@ -89,7 +90,13 @@ The table below shows which release corresponds to each branch, and what date th
 [1776]: https://github.com/Gallopsled/pwntools/pull/1776
 [1846]: https://github.com/Gallopsled/pwntools/pull/1846
 
-## 4.5.0 (`stable`)
+## 4.5.1 (`stable`)
+
+- [#1902][1902] Always specify -F and -P for tmux in run_in_new_termianl
+
+[1902]: https://github.com/Gallopsled/pwntools/pull/1902
+
+## 4.5.0
 
 - [#1261][1261] Misc `run_in_new_terminal` improvements (notably gdb terminated by default)
 - [#1695][1695] Allow using GDB Python API

pwnlib/util/misc.py

@@ -229,7 +229,7 @@ def run_in_new_terminal(command, terminal=None, args=None, kill_at_exit=True, pr
             args     = []
         elif 'TMUX' in os.environ and which('tmux'):
             terminal = 'tmux'
-            args     = ['splitw', '-F' '#{pane_pid}', '-P']
+            args     = ['splitw']
         elif 'STY' in os.environ and which('screen'):
             terminal = 'screen'
             args     = ['-t','pwntools-gdb','bash','-c']
@@ -256,6 +256,12 @@ def run_in_new_terminal(command, terminal=None, args=None, kill_at_exit=True, pr
     if isinstance(args, tuple):
         args = list(args)
 
+    # When not specifying context.terminal explicitly, we used to set these flags above.
+    # However, if specifying terminal=['tmux', 'splitw', '-h'], we would be lacking these flags.
+    # Instead, set them here and hope for the best.
+    if terminal == 'tmux':
+        args += ['-F' '#{pane_pid}', '-P']
+
     argv = [which(terminal)] + args
 
     if isinstance(command, six.string_types):

pwnlib/version.py

@@ -1 +1 @@
-__version__ = '4.6.0beta0'
+__version__ = '4.6.0beta1'

setup.py

@@ -88,7 +88,7 @@
     name                 = 'pwntools',
     python_requires      = '>=2.7',
     packages             = find_packages(),
-    version              = '4.6.0beta0',
+    version              = '4.6.0beta1',
     data_files           = [('pwntools-doc',
                              glob.glob('*.md') + glob.glob('*.txt')),
                             ],