* usr/lib/byobu/include/shutil:

- check for lsb-release before using (not present on Debian)
This commit is contained in:
Dustin Kirkland 2018-08-12 11:28:39 -05:00
commit ab61008511
2 changed files with 3 additions and 1 deletions

2
debian/changelog vendored
View file

@ -48,6 +48,8 @@ byobu (5.127) unreleased; urgency=medium
usr/lib/byobu/include/select-session.py: usr/lib/byobu/include/select-session.py:
- neverending fight with lintian - neverending fight with lintian
- hardcode python3 as our interpreter - hardcode python3 as our interpreter
* usr/lib/byobu/include/shutil:
- check for lsb-release before using (not present on Debian)
-- Dustin Kirkland <kirkland@ubuntu.com> Sun, 27 May 2018 18:07:11 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Sun, 27 May 2018 18:07:11 -0500

View file

@ -318,7 +318,7 @@ get_distro() {
distro=$(. /etc/os-release && echo "$NAME") distro=$(. /etc/os-release && echo "$NAME")
case "$distro" in case "$distro" in
Debian*) Debian*)
distro=$(. /etc/lsb-release && [ -n "$GOOGLE_ID" ] && echo "gLinux" || echo "Debian") [ -r /etc/lsb-release ] && distro=$(. /etc/lsb-release && [ -n "$GOOGLE_ID" ] && echo "gLinux" || echo "Debian")
;; ;;
esac esac
elif [ -r "/etc/issue" ]; then elif [ -r "/etc/issue" ]; then