Skip to content
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.

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

Fix OS detection for OpenSolaris #10601

Merged
merged 2 commits into from
Feb 20, 2014

Conversation

terminalmage
Copy link
Contributor

This fixes the OS detection for OpenSolaris, allowing it to be properly
recognized and for 'os' and 'osrelease' grains to be set correctly.

This fixes the OS detection for OpenSolaris, allowing it to be properly
recognized and for 'os' and 'osrelease' grains to be set correctly.
@terminalmage
Copy link
Contributor Author

Actually hold off, this breaks Solaris 10 detection.

@techhat
Copy link
Contributor

techhat commented Feb 20, 2014

It breaks it? And I trusted you!

@terminalmage
Copy link
Contributor Author

Well it fixes OpenSolaris.... It just breaks Solaris. 😄

My previous commit broke Solaris detection while fixing OpenSolaris.
This fixes that.
@terminalmage
Copy link
Contributor Author

OK, should be good to merge now, pending review:

In [41]: release_re = re.compile(
   ....:                         r'((?:Open)?Solaris|OpenIndiana) (Development)?'
   ....:                         r'\s*(\d+ \d+\/\d+|oi_\S+|snv_\S+)?'
   ....:                     )

In [42]: release_re.search('Solaris 10 10/09').groups()
Out[42]: ('Solaris', None, '10 10/09')

In [43]: release_re.search('OpenSolaris Development snv_134 X86').groups()
Out[43]: ('OpenSolaris', 'Development', 'snv_134')

In [44]: release_re.search('OpenIndiana Development oi_151.1.8 X86 (powered by illumos)').groups()
Out[44]: ('OpenIndiana', 'Development', 'oi_151.1.8')

@ghost
Copy link

ghost commented Feb 20, 2014

Test PASSed.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/1632/

@ghost
Copy link

ghost commented Feb 20, 2014

Test PASSed.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/1633/

thatch45 added a commit that referenced this pull request Feb 20, 2014
@thatch45 thatch45 merged commit 7e73499 into saltstack:develop Feb 20, 2014
@terminalmage terminalmage deleted the opensolaris-os-detection branch March 7, 2014 21:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants