Merge lp:~mtmiller/byobu/lp1411122 into lp:byobu

Proposed by Mike Miller on 2015-01-15
Status: Merged
Merged at revision: 2396
Proposed branch: lp:~mtmiller/byobu/lp1411122
Merge into: lp:byobu
Diff against target: 30 lines (+3/-3)
2 files modified
debian/changelog (+3/-1)
usr/lib/byobu/include/select-session.py (+0/-2)
To merge this branch: bzr merge lp:~mtmiller/byobu/lp1411122
Reviewer Review Type Date Requested Status
Dustin Kirkland  2015-01-15 Pending
Review via email: mp+246536@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2015-01-12 23:39:42 +0000
+++ debian/changelog 2015-01-15 07:06:08 +0000
@@ -1,6 +1,8 @@
1byobu (5.90) unreleased; urgency=medium1byobu (5.90) unreleased; urgency=medium
22
3 * UNRELEASED3 [ Mike Miller ]
4 * usr/lib/byobu/include/select-session.py: LP: #1411122
5 - don't print when attaching and restoring environment variables
46
5 -- Dustin Kirkland <kirkland@ubuntu.com> Mon, 12 Jan 2015 17:39:42 -06007 -- Dustin Kirkland <kirkland@ubuntu.com> Mon, 12 Jan 2015 17:39:42 -0600
68
79
=== modified file 'usr/lib/byobu/include/select-session.py'
--- usr/lib/byobu/include/select-session.py 2015-01-12 23:27:24 +0000
+++ usr/lib/byobu/include/select-session.py 2015-01-15 07:06:08 +0000
@@ -88,12 +88,10 @@
88 cmd = ["tmux", "setenv", "-t", session_name, var, value]88 cmd = ["tmux", "setenv", "-t", session_name, var, value]
89 else:89 else:
90 cmd = ["screen", "-S", session_name, "-X", "setenv", var, value]90 cmd = ["screen", "-S", session_name, "-X", "setenv", var, value]
91 print("Sending variable: %s" % (cmd, ))
92 subprocess.call(cmd, stdout=open(os.devnull, "w"))91 subprocess.call(cmd, stdout=open(os.devnull, "w"))
9392
9493
95def attach_session(session):94def attach_session(session):
96 print("Attaching: [%s]\n" % session)
97 update_environment(session)95 update_environment(session)
98 backend, session_name = session.split("____", 2)96 backend, session_name = session.split("____", 2)
99 # must use the binary, not the wrapper!97 # must use the binary, not the wrapper!

Subscribers

People subscribed via source and target branches