From 11bf755c9bc266d041979ba1180aae7b9eec4cef Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Tue, 14 Nov 2017 14:23:52 +1100
Subject: [PATCH] * usr/lib/byobu/include/select-session.py:   - Fix culling
 sessions with named groups (#25)   -
 https://github.com/dustinkirkland/byobu/pull/25

---
 debian/changelog                        | 5 +++++
 usr/lib/byobu/include/select-session.py | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12a1cc04..43584adc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ byobu (5.124) unreleased; urgency=medium
   * === added directory snap, snap/snapcraft.yaml:
     - initial crack at snap packaging
 
+  [ Ari Pollak ]
+  * usr/lib/byobu/include/select-session.py:
+    - Fix culling sessions with named groups (#25)
+    - https://github.com/dustinkirkland/byobu/pull/25
+
   [ Charles Alva ]
   * usr/bin/purge-old-kernels:
     - make sure we pass through the -f|-y apt options
diff --git a/usr/lib/byobu/include/select-session.py b/usr/lib/byobu/include/select-session.py
index 78b0ea15..a56a8363 100755
--- a/usr/lib/byobu/include/select-session.py
+++ b/usr/lib/byobu/include/select-session.py
@@ -99,10 +99,10 @@ def cull_zombies(session_name):
 		if not output:
 			return
 
-		# Find the master session to extract the group number. We use
+		# Find the master session to extract the group name. We use
 		# the group number to be extra sure the right session is getting
 		# killed. We don't want to accidentally kill the wrong one
-		pattern = "^%s:.+\\((group \\d+)\\).*$" % session_name
+		pattern = "^%s:.+\\((group \\w+)\\).*$" % session_name
 		master = re.search(pattern, output, re.MULTILINE)
 		if not master:
 			return