mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-22 14:24:39 -07:00
* usr/bin/byobu-select-session:
- fix python exception
This commit is contained in:
parent
116568fad6
commit
3a25b2e7ca
2 changed files with 5 additions and 1 deletions
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -20,6 +20,8 @@ byobu (5.31) unreleased; urgency=low
|
||||||
* usr/bin/byobu-launcher-install, usr/bin/byobu-launcher-uninstall:
|
* usr/bin/byobu-launcher-install, usr/bin/byobu-launcher-uninstall:
|
||||||
- LP: #1002137
|
- LP: #1002137
|
||||||
- support fish shell in the installer
|
- support fish shell in the installer
|
||||||
|
* usr/bin/byobu-select-session:
|
||||||
|
- fix python exception
|
||||||
|
|
||||||
-- Dustin Kirkland <kirkland@ubuntu.com> Mon, 28 Jan 2013 02:21:15 -0600
|
-- Dustin Kirkland <kirkland@ubuntu.com> Mon, 28 Jan 2013 02:21:15 -0600
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,7 @@ BYOBU_UPDATE_ENVVARS = ["DISPLAY", "DBUS_SESSION_BUS_ADDRESS", "SESSION_MANAGER"
|
||||||
def get_sessions():
|
def get_sessions():
|
||||||
sessions = []
|
sessions = []
|
||||||
i = 0
|
i = 0
|
||||||
|
output = False
|
||||||
if BYOBU_BACKEND == "screen":
|
if BYOBU_BACKEND == "screen":
|
||||||
try:
|
try:
|
||||||
output = subprocess.Popen(["screen", "-ls"], stdout=subprocess.PIPE).communicate()[0]
|
output = subprocess.Popen(["screen", "-ls"], stdout=subprocess.PIPE).communicate()[0]
|
||||||
|
@ -49,6 +50,7 @@ def get_sessions():
|
||||||
raise
|
raise
|
||||||
else:
|
else:
|
||||||
output = cpe.output
|
output = cpe.output
|
||||||
|
if not sys.stdout.encoding is None:
|
||||||
output = output.decode(sys.stdout.encoding)
|
output = output.decode(sys.stdout.encoding)
|
||||||
if output:
|
if output:
|
||||||
for s in output.splitlines():
|
for s in output.splitlines():
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue