Skip to content

Case insensitive LSB name checking #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dirk-thomas merged 2 commits into from
Jan 2, 2020
Merged

Case insensitive LSB name checking #189

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
630457e
Case insensitive LSB name checking
sloretz Dec 30, 2019
128748f
Restore None check
sloretz Jan 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/rospkg/os_detect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,10 @@ def __init__(self, lsb_name, get_version_fn=None):
self.lsb_info = None

def is_os(self):
return self.lsb_info is not None and self.lsb_info[0] == self.lsb_name
if self.lsb_info is None:
return False
# Work around platform returning 'Ubuntu' and distro returning 'ubuntu'
return self.lsb_info[0].lower() == self.lsb_name.lower()

def get_version(self):
if self.is_os():
Expand Down