From ab61008511cdc002e16bee5661f9043d78938f4d Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sun, 12 Aug 2018 11:28:39 -0500 Subject: [PATCH] * usr/lib/byobu/include/shutil: - check for lsb-release before using (not present on Debian) --- debian/changelog | 2 ++ usr/lib/byobu/include/shutil | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 90c8423b..df1c840a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,8 @@ byobu (5.127) unreleased; urgency=medium usr/lib/byobu/include/select-session.py: - neverending fight with lintian - hardcode python3 as our interpreter + * usr/lib/byobu/include/shutil: + - check for lsb-release before using (not present on Debian) -- Dustin Kirkland Sun, 27 May 2018 18:07:11 -0500 diff --git a/usr/lib/byobu/include/shutil b/usr/lib/byobu/include/shutil index 4cfc5203..0f6d3ed6 100755 --- a/usr/lib/byobu/include/shutil +++ b/usr/lib/byobu/include/shutil @@ -318,7 +318,7 @@ get_distro() { distro=$(. /etc/os-release && echo "$NAME") case "$distro" in 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 elif [ -r "/etc/issue" ]; then