Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ros-infrastructure/rospkg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: gleichdick/rospkg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 14, 2019

  1. Fix openSUSE leap detection 

    File /etc/SuSE-release is absent in recent openSUSE releases (leap 15.0, tumbleweed), so ignore it on first try
    @gleichdick
    gleichdick authored Oct 14, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    713b2b5 View commit details

Commits on Nov 17, 2019

  1. fixed openSuSE tumbleweed detection 

    The ID in `/etc/os-release` is now `opensuse-tumbleweed`
    @gleichdick
    gleichdick authored Nov 17, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1884939 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 src/rospkg/os_detect.py
6 changes: 5 additions & 1 deletion src/rospkg/os_detect.py
View file
Original file line number Diff line number Diff line change
@@ -255,6 +255,9 @@ def get_version(self):
raise OsNotDetected('cannot get version on this OS')

def get_codename(self):
# /etc/SuSE-release is deprecated since 13.1
if self._release_file is None:
return ""
if self.is_os() and os.path.exists(self._release_file):
with open(self._release_file, 'r') as fh:
os_list = fh.read().strip().split('\n')
@@ -743,7 +746,8 @@ def get_codename(self):
OsDetect.register_default(OS_NEON, LsbDetect("neon"))
OsDetect.register_default(OS_OPENEMBEDDED, OpenEmbedded())
OsDetect.register_default(OS_OPENSUSE, OpenSuse())
OsDetect.register_default(OS_OPENSUSE13, OpenSuse(brand_file='/etc/SUSE-brand'))
OsDetect.register_default(OS_OPENSUSE13, OpenSuse(brand_file='/etc/SUSE-brand', release_file=None))
OsDetect.register_default(OS_OPENSUSE, FdoDetect("opensuse-tumbleweed"))
OsDetect.register_default(OS_OPENSUSE, FdoDetect("opensuse"))
OsDetect.register_default(OS_TIZEN, FdoDetect("tizen"))
OsDetect.register_default(OS_OSX, OSX())