Skip to content

Conversation

@oparoz
Copy link
Contributor

@oparoz oparoz commented Sep 2, 2014

No description provided.

@ghost
Copy link

ghost commented Sep 2, 2014

Thanks a lot for your contribution! Contributions to the core repo require a signed contributors agreement http://owncloud.org/contribute/agreement/ Alternatively you can add a comment here stating that this contribution is MIT licensed. Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

@oparoz oparoz changed the title Typ in whichOpenOffice test Typo in whichOpenOffice test Sep 2, 2014
@scrutinizer-notifier
Copy link

The inspection completed: No new issues

@oparoz
Copy link
Contributor Author

oparoz commented Sep 2, 2014

This contribution is MIT licensed, but seriously, it should just be updated upstream

@bantu
Copy link

bantu commented Sep 2, 2014

@oparoz Hey there. Just to clearify, what do you mean with upstream in this case?

@oparoz
Copy link
Contributor Author

oparoz commented Sep 2, 2014

I meant, it's a typo and should just be updated when the file is next touched, but I suppose it's easier to not forget by just merging my change.

@bantu
Copy link

bantu commented Sep 2, 2014

and should just be updated when the file is next touched

Sorry, that's just not how development works.

I suppose it's easier to not forget by just merging my change

Your pull request is much appreciated, thanks.

@bantu
Copy link

bantu commented Sep 2, 2014

@georgehrke Please have a look. The logic doesn't seem to make too much sense to me, btw. If you find libreoffice, why would you keep looking for openoffice?

@georgehrke
Copy link
Contributor

👍 fix makes sense

@georgehrke
Copy link
Contributor

If you find libreoffice, why would you keep looking for openoffice?

It just checks if either libreoffice or openoffice is installed. I don't think it's a big deal that it checks openoffice as well

@DeepDiver1975
Copy link
Member

Is that typo present in master and stable6 as well? @oparoz can you double check? THX

@bantu
Copy link

bantu commented Sep 3, 2014

It just checks if either libreoffice or openoffice is installed. I don't think it's a big deal that it checks openoffice as well

I don't know whether this code is hot or not. Just wanted to point out that unnecessary work is being done. Not sure how expensive shell_exec calls are, they might be depending on what happens in the background, e.g. actually setting up a new shell.

@oparoz
Copy link
Contributor Author

oparoz commented Sep 3, 2014

@DeepDiver1975, indeed, both stable 6 and master have the same typo.

@th3fallen
Copy link
Contributor

👍 Agree with fix but i think @bantu Comment needs attention because it is a completely unnecessary additional check

@PVince81
Copy link
Contributor

PVince81 commented Sep 3, 2014

@owncloud-bot ok to test

@ghost
Copy link

ghost commented Sep 3, 2014

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/7076/

@PVince81
Copy link
Contributor

PVince81 commented Sep 4, 2014

👍

PVince81 pushed a commit that referenced this pull request Sep 4, 2014
Typo in whichOpenOffice test
@PVince81 PVince81 merged commit 459c781 into owncloud:stable7 Sep 4, 2014
@PVince81
Copy link
Contributor

PVince81 commented Sep 4, 2014

NO! What? Why is that going to stable7 ?

@PVince81
Copy link
Contributor

PVince81 commented Sep 4, 2014

@karlitschek should we revert or is this backport material ?

@PVince81
Copy link
Contributor

PVince81 commented Sep 4, 2014

@oparoz please only send pull requests to master, not stable7. They might selectively be backported.

@PVince81
Copy link
Contributor

PVince81 commented Sep 4, 2014

Pushed to master as bbc2d7c

Waiting for confirmation from @karlitschek whether we need to revert on stable7.

@oparoz
Copy link
Contributor Author

oparoz commented Sep 4, 2014

@PVince81, will do! Sorry about that.

@bantu
Copy link

bantu commented Sep 8, 2014

@karlitschek Please see #10823 (comment)

@karlitschek
Copy link
Contributor

@PVince81 yes please

@PVince81
Copy link
Contributor

PVince81 commented Sep 8, 2014

@karlitschek yes revert or yes keep the backport ?

@karlitschek
Copy link
Contributor

Hehe sorry. :-) Let´s keep the backport.
And forward port if not done yet

@PVince81
Copy link
Contributor

Port to master is already here: bbc2d7c

@oparoz oparoz deleted the patch-1 branch October 3, 2014 15:50
@lock lock bot locked as resolved and limited conversation to collaborators Aug 16, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants