commit yast2-installation for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2014-09-07 11:09:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2014-08-30 16:04:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2014-09-07 11:09:58.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Sep 4 12:21:25 UTC 2014 - mvidner@suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.115 + +------------------------------------------------------------------- +Wed Aug 28 15:31:55 UTC 2014 - ancor@suse.com + +- Enabled remote access on systems installed using VNC (bnc#893501) +- 3.1.114 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.113.tar.bz2 New: ---- yast2-installation-3.1.115.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.VuWHWt/_old 2014-09-07 11:09:59.000000000 +0200 +++ /var/tmp/diff_new_pack.VuWHWt/_new 2014-09-07 11:09:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.113 +Version: 3.1.115 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,14 +35,17 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt -BuildRequires: rubygem-rspec BuildRequires: update-desktop-files BuildRequires: yast2-core-devel BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: rubygem(rspec) # Linuxrc.keys BuildRequires: yast2 >= 3.1.41 +# Yast::Remote +BuildRequires: yast2-network + # clone_system client Requires: autoyast2-installation >= 3.1.5 @@ -77,8 +80,10 @@ # Systemd default target and services Requires: yast2-services-manager +# Yast::Remote +Requires: yast2-network + # Only in inst-sys -# Requires: yast2-network # Requires: yast2-add-on # Requires: yast2-update ++++++ yast2-installation-3.1.113.tar.bz2 -> yast2-installation-3.1.115.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/package/yast2-installation.changes new/yast2-installation-3.1.115/package/yast2-installation.changes --- old/yast2-installation-3.1.113/package/yast2-installation.changes 2014-08-28 15:35:08.000000000 +0200 +++ new/yast2-installation-3.1.115/package/yast2-installation.changes 2014-09-04 16:34:13.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Sep 4 12:21:25 UTC 2014 - mvidner@suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.115 + +------------------------------------------------------------------- +Wed Aug 28 15:31:55 UTC 2014 - ancor@suse.com + +- Enabled remote access on systems installed using VNC (bnc#893501) +- 3.1.114 + +------------------------------------------------------------------- Thu Aug 28 15:04:59 CEST 2014 - locilka@suse.com - Setting data for &product; macro (used in helps) as soon as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/package/yast2-installation.spec new/yast2-installation-3.1.115/package/yast2-installation.spec --- old/yast2-installation-3.1.113/package/yast2-installation.spec 2014-08-28 15:35:08.000000000 +0200 +++ new/yast2-installation-3.1.115/package/yast2-installation.spec 2014-09-04 16:34:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.113 +Version: 3.1.115 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,11 +35,14 @@ BuildRequires: docbook-xsl-stylesheets libxslt update-desktop-files yast2-core-devel BuildRequires: yast2-devtools >= 3.1.10 -BuildRequires: rubygem-rspec +BuildRequires: rubygem(rspec) # Linuxrc.keys BuildRequires: yast2 >= 3.1.41 +# Yast::Remote +BuildRequires: yast2-network + # clone_system client Requires: autoyast2-installation >= 3.1.5 @@ -74,8 +77,10 @@ # Systemd default target and services Requires: yast2-services-manager +# Yast::Remote +Requires: yast2-network + # Only in inst-sys -# Requires: yast2-network # Requires: yast2-add-on # Requires: yast2-update diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/src/Makefile.am new/yast2-installation-3.1.115/src/Makefile.am --- old/yast2-installation-3.1.113/src/Makefile.am 2014-08-28 15:35:08.000000000 +0200 +++ new/yast2-installation-3.1.115/src/Makefile.am 2014-09-04 16:34:13.000000000 +0200 @@ -62,6 +62,7 @@ clients/pre_umount_finish.rb \ clients/prep_shrink_finish.rb \ clients/proxy_finish.rb \ + clients/remote_finish.rb \ clients/save_config_finish.rb \ clients/save_hw_status_finish.rb \ clients/ssh_settings_finish.rb \ @@ -107,7 +108,8 @@ lib/installation/cio_ignore.rb \ lib/installation/clone_settings.rb \ lib/installation/minimal_installation.rb \ - lib/installation/prep_shrink.rb + lib/installation/prep_shrink.rb \ + lib/installation/remote_finish_client.rb EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(desktop_DATA) $(fillup_DATA) $(ylib_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/src/clients/inst_finish.rb new/yast2-installation-3.1.115/src/clients/inst_finish.rb --- old/yast2-installation-3.1.113/src/clients/inst_finish.rb 2014-08-28 15:35:08.000000000 +0200 +++ new/yast2-installation-3.1.115/src/clients/inst_finish.rb 2014-09-04 16:34:13.000000000 +0200 @@ -191,6 +191,7 @@ "firewall_stage1", "ntp-client", "ssh_settings", + "remote", "save_hw_status", "users", "autoinst_scripts2", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/src/clients/remote_finish.rb new/yast2-installation-3.1.115/src/clients/remote_finish.rb --- old/yast2-installation-3.1.113/src/clients/remote_finish.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.115/src/clients/remote_finish.rb 2014-09-04 16:34:13.000000000 +0200 @@ -0,0 +1,19 @@ +# encoding: utf-8 + +# ------------------------------------------------------------------------------ +# Copyright (c) 2014 SUSE Linux GmbH. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# ------------------------------------------------------------------------------ +require "installation/remote_finish_client" + +Installation::RemoteFinishClient.new.run(*Yast::WFM.Args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/src/lib/installation/remote_finish_client.rb new/yast2-installation-3.1.115/src/lib/installation/remote_finish_client.rb --- old/yast2-installation-3.1.113/src/lib/installation/remote_finish_client.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.115/src/lib/installation/remote_finish_client.rb 2014-09-04 16:34:13.000000000 +0200 @@ -0,0 +1,84 @@ +# encoding: utf-8 + +# ------------------------------------------------------------------------------ +# Copyright (c) 2014 SUSE Linux GmbH. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# ------------------------------------------------------------------------------ + +require 'yast' + +module Installation + + # Step of base installation finish for remote administration (VNC) + class RemoteFinishClient + include Yast::Logger + include Yast::I18n + + def initialize + Yast.import "Linuxrc" + Yast.import "Remote" + textdomain "installation" + end + + # Executes the function passed as a first argument, to be called by + # WMF.CallFunction + def run(*args) + ret = nil + if args.empty? + func = "" + else + func = args.first.to_s + end + + log.info "starting remote_finish" + log.debug "func=#{func}" + + case func + when "Info" + ret = { + "steps" => 1, + "title" => title, + "when" => modes + } + when "Write" + enable_remote + else + log.error "unknown function: #{func}" + end + + log.debug "ret=#{ret}" + log.info "remote_finish finished" + ret + end + + # Text to display + # + # @return String + def title + _("Enabling remote administration...") + end + + # Modes in which #enable_remote should be called + # + # @return Array<Symbol> + def modes + Yast::Linuxrc.vnc ? [:installation, :autoinst] : [] + end + + # Enables remote access + def enable_remote + Yast::Remote.Enable + Yast::Remote.Write + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/test/Makefile.am new/yast2-installation-3.1.115/test/Makefile.am --- old/yast2-installation-3.1.113/test/Makefile.am 2014-08-28 15:35:08.000000000 +0200 +++ new/yast2-installation-3.1.115/test/Makefile.am 2014-09-04 16:34:13.000000000 +0200 @@ -1,7 +1,8 @@ TESTS = \ inst_functions_test.rb \ cio_ignore_test.rb \ - prep_shrink_test.rb + prep_shrink_test.rb \ + remote_finish_test.rb TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/test/remote_finish_test.rb new/yast2-installation-3.1.115/test/remote_finish_test.rb --- old/yast2-installation-3.1.113/test/remote_finish_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.115/test/remote_finish_test.rb 2014-09-04 16:34:13.000000000 +0200 @@ -0,0 +1,62 @@ +#!/usr/bin/env rspec + +require_relative "./test_helper" +require "installation/remote_finish_client" + +module Yast + import "WFM" + import "Linuxrc" + + describe ::Installation::RemoteFinishClient do + + subject { ::Installation::RemoteFinishClient.new } + + describe "#run" do + it "can be called as a WFM client with 'Info'" do + allow(Linuxrc).to receive(:vnc) + result = Yast::WFM.CallFunction("remote_finish", ["Info"]) + expect(result).to be_a(Hash) + expect(result["steps"]).to eq(1) + end + + it "can be called as a WFM client with 'Write'" do + expect_any_instance_of(::Installation::RemoteFinishClient).to receive(:enable_remote) + expect(Yast::WFM.CallFunction("remote_finish", ["Write"])).to be_nil + end + end + + describe "#modes" do + let(:modes) { + subject.modes + } + + context "using VNC" do + before do + allow(Linuxrc).to receive(:vnc).and_return true + end + + it "configures remote access for installation and autoinst" do + expect(modes.sort).to eq([:autoinst, :installation]) + end + end + + context "not using VNC " do + before do + allow(Linuxrc).to receive(:vnc).and_return false + end + + it "does not configure remote access" do + expect(modes).to be_empty + end + end + end + + describe "#enable_remote" do + it "enables remote access" do + expect(Remote).to receive(:Write) + subject.enable_remote + expect(Remote.IsEnabled).to eql(true) + end + end + end +end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de