Opened 2 years ago

Closed 2 years ago

Last modified 2 years ago

#13365 closed bug (fixed)

[Repositories] Haiku name should not be used explicitly

Reported by: KapiX Owned by: perelandra
Priority: normal Milestone: Unscheduled
Component: Preferences/Repositories Version: R1/Development
Keywords: gsoc2017 Cc:
Blocked By: Blocking:
Has a Patch: yes Platform: All

Description

Given that Haiku can be built in non-official mode, Haiku name should not be used directly.

Here: http://cgit.haiku-os.org/haiku/tree/src/preferences/repositories/RepositoriesView.cpp#n154

Should be done like in Tracker: http://cgit.haiku-os.org/haiku/tree/src/kits/tracker/FSUtils.cpp#n735

Attachments (2)

0001-String-modified.patch (1.0 KB) - added by anirudh 2 years ago.
0001-Changed-String-in-RepositoriesView.patch (1.0 KB) - added by anirudh 2 years ago.
Updated String

Download all attachments as: .zip

Change History (20)

comment:1 Changed 2 years ago by humdinger

Even simpler: "Enable the repositories to be used by package management:"

comment:2 Changed 2 years ago by axeld

While I don't mind changing the string, I don't think anybody is actually using that non-official mode currently, so I don't think we should dump any developer resources in this direction -- if anyone actually needs this, he could send in the patches himself :-)

comment:3 Changed 2 years ago by humdinger

Yeah, agreed. But here it's easiest to just leave out "Haiku" completely. It's unneeded, we don't say "Open with Haiku's Tracker" etc. either. :)

comment:4 Changed 2 years ago by anirudh

Has a Patch: set

Here's the patch, replaced the string and removed the word 'Haiku', must be fine now! :) And there goes my first contribution.

Last edited 2 years ago by anirudh (previous) (diff)

comment:5 Changed 2 years ago by humdinger

There's still the "Select" in line 153 that has to be removed. Also "package" instead of "Packet" and remove the space in front of "Enable".

Changed 2 years ago by anirudh

Attachment: 0001-String-modified.patch added

comment:6 in reply to:  5 Changed 2 years ago by anirudh

Replying to humdinger:

There's still the "Select" in line 153 that has to be removed. Also "package" instead of "Packet" and remove the space in front of "Enable".

I hope things are correct now with the new patch. Sorry for messing up.

comment:7 Changed 2 years ago by humdinger

For one, it's still lower case "package". Then the second patch relies on the 1st patch. You should create a new single patch to be applied to the orignal file. So revert by checking out the original RepositoriesView.cpp and make your changes once more. Dunno if there's a better solution, I'm not that familiar with the git intricacies...

comment:8 Changed 2 years ago by scottmc

Please break the long line up into two lines like the orignal code was. Please review the coding guidelines.

"A line must not have more than 80 columns; when wrapping a line, you usually indent one extra tab, but that can get more depending on the contents."

https://www.haiku-os.org/development/coding-guidelines/

comment:9 Changed 2 years ago by scottmc

Still off by two spaces. "...you usually indent one extra tab, but that can get more depending on the contents."

Tab stops should be set to 4 spaces.

comment:10 Changed 2 years ago by humdinger

Read: replace the 2 spaces at the start of line 154 with one tab.

comment:11 in reply to:  10 Changed 2 years ago by anirudh

Replying to humdinger:

Read: replace the 2 spaces at the start of line 154 with one tab.

And finally done. Really sorry for the mess, won't happen in future. Understood the working. Let me know if there's any more changes.

comment:12 Changed 2 years ago by humdinger

Really sorry, I don't want to frustrate you... It's one tab, not 4 spaces.

Changed 2 years ago by anirudh

Updated String

comment:13 in reply to:  12 Changed 2 years ago by anirudh

Replying to humdinger:

Really sorry, I don't want to frustrate you... It's one tab, not 4 spaces.

Upon one backspace, the whole tab gets moved. It's one tab, I'm not sure why it shows 4 spaces for you. Please check now.

comment:14 Changed 2 years ago by waddlesplash

Really sorry, I don't want to frustrate you... It's one tab, not 4 spaces.

@scottmc, @humdinger: Trac displays tabs in patches as spaces. The actual patch file looks OK to me.

comment:15 Changed 2 years ago by anevilyak

Owner: set to perelandra
Status: newassigned

comment:16 Changed 2 years ago by humdinger

Resolution: fixed
Status: assignedclosed

@waddlesplash: the original patch had those 4 spaces, anirudh has corrected since.
Applied with hrev51006. Thanks!

comment:17 Changed 2 years ago by anirudh

Marking this ticket with the keyword gsoc2017 to indicate it as one of my submission for Summer of Code 2017.

comment:18 Changed 2 years ago by pulkomandy

Keywords: gsoc2017 added
Note: See TracTickets for help on using tickets.