Skip to content

Commit

Permalink
Move the debugger invocation to ruby-bindings (FATE#318421) (#386)
Browse files Browse the repository at this point in the history
* Move the debugger invocation to ruby-bindings (FATE#318421)

... to use the same implementation at run time.

- 3.1.190

* revert also the dependency
  • Loading branch information
lslezak committed May 31, 2016
1 parent ec69349 commit 75415e6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 23 deletions.
7 changes: 7 additions & 0 deletions package/yast2-installation.changes
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 30 14:35:05 UTC 2016 - lslezak@suse.cz

- Move the debugger invocation code to yast2-ruby-bindings package
to use the same implementation at run time (FATE#318421)
- 3.1.190

-------------------------------------------------------------------
Thu May 26 13:17:42 UTC 2016 - kanderssen@suse.com

Expand Down
5 changes: 2 additions & 3 deletions package/yast2-installation.spec
Expand Up @@ -17,7 +17,7 @@


Name: yast2-installation
Version: 3.1.189
Version: 3.1.190
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand All @@ -26,8 +26,7 @@ Source0: %{name}-%{version}.tar.bz2
Group: System/YaST
License: GPL-2.0
Url: http://github.com/yast/yast-installation
# yast/debugger
Requires: yast2-ruby-bindings >= 3.1.47
Requires: yast2-ruby-bindings >= 3.1.8

Summary: YaST2 - Installation Parts

Expand Down
20 changes: 0 additions & 20 deletions src/lib/installation/clients/installation.rb
Expand Up @@ -47,9 +47,6 @@ def main
UI.SetProductLogo(true)
Wizard.OpenLeftTitleNextBackDialog

# start the debugger if requested (FATE#318421)
start_debugger

Wizard.SetContents(
# title
"",
Expand Down Expand Up @@ -104,22 +101,5 @@ def main

deep_copy(@ret)
end

private

# start the Ruby debugger if booted with the Y2DEBUGGER option
def start_debugger
return unless (Linuxrc.InstallInf("Cmdline") || "").match(/\bY2DEBUGGER=(.*)\b/i)

option = Regexp.last_match[1]
log.info "Y2DEBUGGER option: #{option}"

if option == "1" || option == "remote" || option == "manual"
require "yast/debugger"
Debugger.start(remote: option == "remote", start_client: option != "manual")
else
log.warn "Unknown Y2DEBUGGER value: #{option}"
end
end
end
end

0 comments on commit 75415e6

Please sign in to comment.