* usr/lib/byobu/include/select-session.py:

- Fix culling sessions with named groups (#25)
  - https://github.com/dustinkirkland/byobu/pull/25
This commit is contained in:
Dustin Kirkland 2017-11-14 14:23:52 +11:00
commit 11bf755c9b
2 changed files with 7 additions and 2 deletions

5
debian/changelog vendored
View file

@ -9,6 +9,11 @@ byobu (5.124) unreleased; urgency=medium
* === added directory snap, snap/snapcraft.yaml: * === added directory snap, snap/snapcraft.yaml:
- initial crack at snap packaging - 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 ] [ Charles Alva ]
* usr/bin/purge-old-kernels: * usr/bin/purge-old-kernels:
- make sure we pass through the -f|-y apt options - make sure we pass through the -f|-y apt options

View file

@ -99,10 +99,10 @@ def cull_zombies(session_name):
if not output: if not output:
return 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 # the group number to be extra sure the right session is getting
# killed. We don't want to accidentally kill the wrong one # 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) master = re.search(pattern, output, re.MULTILINE)
if not master: if not master:
return return