Trinity-*-2.eclass: Fix some typos and cleanup. #8

Merged
Chris merged 1 commits from fix/eclass-2 into master 4 years ago
Chris commented 4 years ago
Collaborator

Some more typos fixed and cleanup. Hope that is okay for you. If you don't want the credits just let me know. 😸

EDIT: I re-pushed that branch some times more because I had to deal with some things. I hope you are not working at that files right now and have already fixed some things yourself. If so I will trash my PR and we use your version. 👍

Signed-off-by: Chris xchrisx@uber.space

Some more typos fixed and cleanup. Hope that is okay for you. If you don't want the credits just let me know. :smile_cat: EDIT: I re-pushed that branch some times more because I had to deal with some things. I hope you are not working at that files right now and have already fixed some things yourself. If so I will trash my PR and we use your version. :+1: Signed-off-by: Chris <xchrisx@uber.space>
Collaborator

I don't mind, but it looks like I'm going to have to give it another, more careful grammar-oriented look. "Possible arguments values 'yes', 'no' and 'optional'" is not good English!

I don't mind, but it looks like I'm going to have to give it another, more careful grammar-oriented look. "Possible arguments values 'yes', 'no' and 'optional'" is not good English!
Chris commented 4 years ago
Poster
Collaborator

Yes, it's in no way perfect and yes, that is not good English. That one I will fix. At least I found some other typos. 👍

Yes, it's in no way perfect and yes, that is not good English. That one I will fix. At least I found some other typos. :+1:
Chris commented 4 years ago
Poster
Collaborator

Latest version also fixes the handbook and arts CMake flags to be EAPI7 complicant. Latest not in use, but why not.

EDIT: Just noticed, you did already the same in your new branch. So ignore that one. 👍

Latest version also fixes the handbook and arts CMake flags to be EAPI7 complicant. Latest not in use, but why not. EDIT: Just noticed, you did already the same in your new branch. So ignore that one. :+1:
Chris commented 4 years ago
Poster
Collaborator

Just looked over that again.

The problem here is, that you should better do this eclass changes in your current working branch within a seperate branch. Because some changes/fixes I did to the eclasses files myself now will block your changes to the same eclass files in your current working branch.

But I can't wait until your current work is fully finished and let the eclass changes out until that point. If you would had do some seperate PR about them, I just could merge them seperately.

So I will let my PR now this way, but that will lead to that your eclass commit in your current working branch will have some merge conflict, you need to resolve than when merging. This way I can still keep up working on additional ebuilds, without getting errors about the eclasses. Hope that is okay for you?

EDIT: For reference - cf4b9e2d80

Just looked over that again. The problem here is, that you should better do this eclass changes in your current working branch within a seperate branch. Because some changes/fixes I did to the eclasses files myself now will block your changes to the same eclass files in your current working branch. But I can't wait until your current work is fully finished and let the eclass changes out until that point. If you would had do some seperate PR about them, I just could merge them seperately. So I will let my PR now this way, but that will lead to that your eclass commit in your current working branch will have some merge conflict, you need to resolve than when merging. This way I can still keep up working on additional ebuilds, without getting errors about the eclasses. Hope that is okay for you? EDIT: For reference - https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/commit/cf4b9e2d80b6459729ff2466cbb336247f873014
Chris closed this pull request 4 years ago
Chris deleted branch fix/eclass-2 4 years ago
Collaborator

Don't worry about it. The confusion is due to my poor working practices, so it's my responsibility to resolve it.

(I can count the number of times I've tried to work collboratively on the same codebase with someone on one hand, and some of those were before git was a thing, so I will be screwing up on workflow and git tree management. Probably often. Sorry.)

Don't worry about it. The confusion is due to my poor working practices, so it's my responsibility to resolve it. (I can count the number of times I've tried to work collboratively on the same codebase with someone on one hand, and some of those were before git was a thing, so I *will* be screwing up on workflow and git tree management. Probably often. Sorry.)
Chris commented 4 years ago
Poster
Collaborator

No problem. I just wanted to give you some input and tried to find some good way to not make it too complicated. 😄

No problem. I just wanted to give you some input and tried to find some good way to not make it too complicated. :smile:
Chris added this to the R14.0.8 release milestone 4 years ago
The pull request has been merged as 084b0b62ec.
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/tde-packaging-gentoo#8
Loading…
There is no content yet.