Skip to content
Permalink
Browse files

Merge pull request #5 from yast/hook_display_bnc813235

Always display full hook name in the popup (bnc#813235)
  • Loading branch information...
lslezak committed Apr 4, 2013
2 parents 4108005 + c7a57ec commit 1293c5c0674a833c2b59de2f0f2f2a651ee32815
Showing with 8 additions and 9 deletions.
  1. +1 −1 VERSION
  2. +5 −0 package/yast2-wagon.changes
  3. +2 −8 src/modules/Wagon.ycp
@@ -1 +1 @@
2.17.35
2.17.36
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Apr 4 08:28:26 UTC 2013 - lslezak@suse.cz

- always display full hook name in the popup (bnc#813235)

-------------------------------------------------------------------
Thu Mar 21 21:11:08 UTC 2013 - lslezak@suse.cz

@@ -914,13 +914,7 @@ It it also safe to abort the migration now.</b></li>")
y2milestone("Executing hook script: %1", script);

// %1 is a file name
string display_script = regexpsub(script, "^" + step + "_[0-9]+_(.*)", "\\1");
if (display_script == nil)
{
display_script = script;
}

UI::OpenDialog(`Label(sformat(_("Executing script %1 ..."), display_script)));
UI::OpenDialog(`Label(sformat(_("Executing script %1 ..."), script)));
integer ret = (integer)SCR::Execute(.target.bash, hook_dir + "/" + script);
UI::CloseDialog();

@@ -933,7 +927,7 @@ It it also safe to abort the migration now.</b></li>")
// Continue = ignore the failure and run the other scripts for this step (if present)
// Cancel = quit, don't run anything
// Retry = run it again, retry it
sformat(_("Hook script '%1' failed\n\nContinue with other scripts, cancel scripts or try it again?"), display_script),
sformat(_("Hook script '%1' failed\n\nContinue with other scripts, cancel scripts or try it again?"), script),
_("Continue"), _("Cancel"), _("Retry"), `focus_yes
);

0 comments on commit 1293c5c

Please sign in to comment.
You can’t perform that action at this time.