From 3a25b2e7ca46d94297fc913d66f0e07dc64a6b63 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Wed, 6 Feb 2013 22:00:31 -0600 Subject: [PATCH] * usr/bin/byobu-select-session: - fix python exception --- debian/changelog | 2 ++ usr/bin/byobu-select-session | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fd5a9c71..c0cc10d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ byobu (5.31) unreleased; urgency=low * usr/bin/byobu-launcher-install, usr/bin/byobu-launcher-uninstall: - LP: #1002137 - support fish shell in the installer + * usr/bin/byobu-select-session: + - fix python exception -- Dustin Kirkland Mon, 28 Jan 2013 02:21:15 -0600 diff --git a/usr/bin/byobu-select-session b/usr/bin/byobu-select-session index fe58ae82..6e6563fa 100755 --- a/usr/bin/byobu-select-session +++ b/usr/bin/byobu-select-session @@ -40,6 +40,7 @@ BYOBU_UPDATE_ENVVARS = ["DISPLAY", "DBUS_SESSION_BUS_ADDRESS", "SESSION_MANAGER" def get_sessions(): sessions = [] i = 0 + output = False if BYOBU_BACKEND == "screen": try: output = subprocess.Popen(["screen", "-ls"], stdout=subprocess.PIPE).communicate()[0] @@ -49,7 +50,8 @@ def get_sessions(): raise else: output = cpe.output - output = output.decode(sys.stdout.encoding) + if not sys.stdout.encoding is None: + output = output.decode(sys.stdout.encoding) if output: for s in output.splitlines(): s = re.sub(r'\s+', ' ', s)