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

Added endeavouros to the distro list in with_pacman in oss.py #11970 #11971

Merged
merged 2 commits into from
Sep 5, 2022
Merged

Added endeavouros to the distro list in with_pacman in oss.py #11970 #11971

merged 2 commits into from
Sep 5, 2022

Conversation

cchulo
Copy link
Contributor

@cchulo cchulo commented Aug 27, 2022

Changelog: Bugfix: Add "endeavouros" to the list of distros with pacman.
Docs: Omit

Close #11970

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

@CLAassistant
Copy link

CLAassistant commented Aug 27, 2022

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing

The integration that you are modifying is legacy, and shouldn't be used anymore.
The recommended one is in from conan.tools.system ...

Please have a look to https://docs.conan.io/en/latest/reference/conanfile/tools.html, and the place to do the modifications is in https://github.com/conan-io/conan/blob/develop/conan/tools/system/package_manager.py

@cchulo
Copy link
Contributor Author

cchulo commented Aug 27, 2022

@memsharded done

@cchulo cchulo requested a review from memsharded August 27, 2022 12:13
Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you tried this manually and it is working?
I thought it was ok, but I did a routine check on https://github.com/python-distro/distro/blob/master/src/distro/distro.py, and I don't think that distro.id() will be returning the endeavouros string. Am I missing something? Is distro capable of returning this even if not documented explicitly in the project?

@cchulo
Copy link
Contributor Author

cchulo commented Aug 28, 2022

well this is why I had the previous change, I traced the code back to oss.py, though you said it was legacy, that's what led me to that file in the first place

@cchulo
Copy link
Contributor Author

cchulo commented Aug 28, 2022

Actually I should be more specific, the initial commit to oss.py was traced back from OpenGL's recipe, tools which is imported from conans and then just reading that code led me to oss.py, I decided not to change that file at your advise that it is legacy and instead implemented the change at the other location you suggested, not exactly sure how to test this change to ensure that it is working. Still with your earlier advise to setup [conf] flags in my profile I was able to work around this anyway.

Give me a couple of more days to test this. If you have any ideas as to how to proceed please let me know.

@memsharded
Copy link
Member

No, the code is ok, the change you did put the fix in the right place. I think the problem would be the same in the other legacy place as well.

The underlying issue is that Conan uses the return of distro.id() to feed it into those dictionaries. But it seems that distro.id() doesn't return endeavouros string, at least my inspection of the distro code. The way to check it would be just import distro + distro.id() in your python in your system.

@cchulo
Copy link
Contributor Author

cchulo commented Aug 29, 2022

No, the code is ok, the change you did put the fix in the right place. I think the problem would be the same in the other legacy place as well.

The underlying issue is that Conan uses the return of distro.id() to feed it into those dictionaries. But it seems that distro.id() doesn't return endeavouros string, at least my inspection of the distro code. The way to check it would be just import distro + distro.id() in your python in your system.

I had my hard drive fail, its going to take me a bit to get back to you, I will ping you as soon as I am able to, would be back up and running, but I have work, I may not be able to get back to this until this upcoming weekend

@cchulo
Copy link
Contributor Author

cchulo commented Sep 4, 2022

@memsharded sorry for that week-long delay, got around to it, and yes, distro.id() on my OS the method returns correctly:

>>> import distro
>>> distro.id()
'endeavouros'
>>> 

Is it safe to merge this in now?

@cchulo cchulo requested a review from memsharded September 4, 2022 22:50
@memsharded memsharded added this to the 1.53 milestone Sep 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[bug] EndeavourOS not among list of distros listed for pacman support
3 participants