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

Grub1 crash #236

Merged
merged 4 commits into from
Jun 1, 2015
Merged

Grub1 crash #236

merged 4 commits into from
Jun 1, 2015

Conversation

jreidinger
Copy link
Member

No description provided.

@@ -128,7 +128,7 @@ def MainDialog

)
if ret != :back && ret != :abort && ret != :cancel
@return_tab = CWMTab.LastTab
@return_tab = CWMTab.LastTab || "tab"
Copy link
Member

Choose a reason for hiding this comment

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

So "tab" is both the id of an existing Tab widget, and a fake name of a non-existing tab?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, it is a bit tricky. In grub2 due to different design it do not exists, so it is replaced by installation tab. So I use it here as default value.

Copy link
Member

Choose a reason for hiding this comment

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

So, could we use "fake_tab" here...

Copy link
Member Author

Choose a reason for hiding this comment

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

no as fake_tab do not exist, it should be existing id value

@@ -128,7 +128,7 @@ def MainDialog

)
if ret != :back && ret != :abort && ret != :cancel
@return_tab = CWMTab.LastTab
@return_tab = CWMTab.LastTab || "tab"
@return_tab = "installation" if @return_tab.include? "tab" # workaround different tab set for grub2
Copy link
Member

Choose a reason for hiding this comment

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

and "_tab" here?

Copy link
Member Author

Choose a reason for hiding this comment

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

no as tab is proposed as initial tag elsewhere in code. So different part of code propose as default return_tab "tab" and here it is changed to grub2 default return tab..it is just relict of old multi-bootloader code that have here condition if bootloader == "grub2" && which is now useless. It deserve more cleaning but it is not part of this pr and I hope it will be cleaned together with perl-bootloader support drop off

@jreidinger
Copy link
Member Author

LGTMed on IRC

jreidinger added a commit that referenced this pull request Jun 1, 2015
@jreidinger jreidinger merged commit 6167da9 into master Jun 1, 2015
@jreidinger jreidinger deleted the grub1_crash branch June 1, 2015 15:59
@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 1cb3ce0 on grub1_crash into * on master*.

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling dd59501 on grub1_crash into * on master*.

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.

None yet

3 participants