Mailinglist Archive: yast-commit (1271 mails)

< Previous Next >
[yast-commit] [ci_new_pac] JFYI yast2-network -> sle12
Script 'mail_helper' called by ro
Hello packager,

This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.

Here comes the log...

---------------------------%<------------------------------
Hi,

here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network ->
sle12



## BNC# 888130 : "Missing iw package during install." (RESOLVED/FIXED)
## BNC# 893606 : "yast2 remote admin restarts desktop" (RESOLVED/FIXED)

Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes
2014-09-16 16:59:16.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes
2014-09-17 16:03:51.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Sep 17 15:26:59 CEST 2014 - locilka@xxxxxxxx
+
+- Do not check for / install packages in inst-sys (bnc#888130)
+- 3.1.99
+
+-------------------------------------------------------------------
+Tue Sep 16 15:22:29 CEST 2014 - locilka@xxxxxxxx
+
+- Remote administration adjusted to warn users that they need to
+ restart display manager manually if it's needed (bnc#893606)
+- 3.1.98
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-network
- at least 19 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old)
and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:44254
MAIL:yast-commit@xxxxxxxxxxxx) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-network", Maintainer is "yast-commit@xxxxxxxxxxxx"


Old:
----
yast2-network-3.1.97.tar.bz2

New:
----
yast2-network-3.1.99.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.O3LNU0/_old 2014-09-17 17:14:54.000000000 +0200
+++ /var/tmp/diff_new_pack.O3LNU0/_new 2014-09-17 17:14:54.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2-network
-Version: 3.1.97
+Version: 3.1.99
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build

++++++ yast2-network-3.1.97.tar.bz2 -> yast2-network-3.1.99.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.97/package/yast2-network.changes
new/yast2-network-3.1.99/package/yast2-network.changes
--- old/yast2-network-3.1.97/package/yast2-network.changes 2014-09-16
10:16:22.000000000 +0200
+++ new/yast2-network-3.1.99/package/yast2-network.changes 2014-09-17
16:01:23.000000000 +0200
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Wed Sep 17 15:26:59 CEST 2014 - locilka@xxxxxxxx
+
+- Do not check for / install packages in inst-sys (bnc#888130)
+- 3.1.99
+
+-------------------------------------------------------------------
+Tue Sep 16 15:22:29 CEST 2014 - locilka@xxxxxxxx
+
+- Remote administration adjusted to warn users that they need to
+ restart display manager manually if it's needed (bnc#893606)
+- 3.1.98
+
+-------------------------------------------------------------------
Fri Sep 12 11:44:46 UTC 2014 - mfilka@xxxxxxxx

- bnc#894089
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.97/package/yast2-network.spec
new/yast2-network-3.1.99/package/yast2-network.spec
--- old/yast2-network-3.1.97/package/yast2-network.spec 2014-09-16
10:16:22.000000000 +0200
+++ new/yast2-network-3.1.99/package/yast2-network.spec 2014-09-17
16:01:23.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2-network
-Version: 3.1.97
+Version: 3.1.99
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.97/src/include/network/routines.rb
new/yast2-network-3.1.99/src/include/network/routines.rb
--- old/yast2-network-3.1.97/src/include/network/routines.rb 2014-09-16
10:16:22.000000000 +0200
+++ new/yast2-network-3.1.99/src/include/network/routines.rb 2014-09-17
16:01:23.000000000 +0200
@@ -51,6 +51,7 @@
Yast.import "Mode"
Yast.import "IP"
Yast.import "TypeRepository"
+ Yast.import "Stage"
end

# Abort function
@@ -135,7 +136,17 @@
def PackagesInstall(packages)
packages = deep_copy(packages)
return :next if packages == []
- Builtins.y2debug("Checking packages: %1", packages)
+
+ log.info "Checking packages: #{packages}"
+
+ # bnc#888130 In inst-sys, there is no RPM database to check
+ # If the required package is part of the inst-sys, it will work,
+ # if not, package can't be installed anyway
+ #
+ # Ideas:
+ # - check /.packages.* for presence of the required package
+ # - use `extend` to load the required packages on-the-fly
+ return :next if Stage.initial

Yast.import "Package"
return :next if Package.InstalledAll(packages)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.97/src/modules/Remote.rb
new/yast2-network-3.1.99/src/modules/Remote.rb
--- old/yast2-network-3.1.97/src/modules/Remote.rb 2014-09-16
10:16:22.000000000 +0200
+++ new/yast2-network-3.1.99/src/modules/Remote.rb 2014-09-17
16:01:23.000000000 +0200
@@ -39,6 +39,8 @@

PKG_CONTAINING_FW_SERVICES = "xorg-x11-Xvnc"

+ GRAPHICAL_TARGET = "graphical"
+
def main
Yast.import "UI"
textdomain "network"
@@ -54,6 +56,7 @@
Yast.import "String"
Yast.import "FileUtils"
Yast.import "Message"
+ Yast.import "SystemdTarget"

Yast.include self, "network/routines.rb"

@@ -262,7 +265,7 @@
Ops.set(m, "changed", true)
Ops.set(m, "enabled", @allow_administration)
server_args = Ops.get_string(m, "server_args", "")
- if @allow_administration
+ if IsEnabled()
# use none authentication, xdm will take care of it
Ops.set(m, "server_args", SetSecurityType(server_args, @SEC_NONE))
else
@@ -311,7 +314,7 @@

if Mode.normal
ProgressNextStage(_("Restarting the service..."))
- restart_service
+ restart_services
Progress.NextStage
end

@@ -327,7 +330,7 @@
# @return [Boolean] true if success, false otherwise
def configure_display_manager

- if @allow_administration
+ if IsEnabled()
# Install required packages
if !Package.InstallAll(Packages.vnc_packages)
log.error "Installing of required packages failed"
@@ -354,47 +357,48 @@
# Set DISPLAYMANAGER_REMOTE_ACCESS in sysconfig/displaymanager
SCR.Write(
path(".sysconfig.displaymanager.DISPLAYMANAGER_REMOTE_ACCESS"),
- @allow_administration ? "yes" : "no"
+ IsEnabled() ? "yes" : "no"
)
SCR.Write(
path(".sysconfig.displaymanager.DISPLAYMANAGER_ROOT_LOGIN_REMOTE"),
- @allow_administration ? "yes" : "no"
+ IsEnabled() ? "yes" : "no"
)
SCR.Write(path(".sysconfig.displaymanager"), nil)

- #Query xinetd presence here (it might not have been even installed
before)
- have_xinetd = Package.Installed("xinetd")
-
#Do this only if package xinetd is installed (#256385)
- return false if have_xinetd && !WriteXinetd()
+ return false if Package.Installed("xinetd") && !WriteXinetd()

true
end

+ def restart_display_manager
+ if Service.active?(XDM_SERVICE_NAME)
+ Report.Error(Message.CannotRestartService(XDM_SERVICE_NAME)) unless
Service.Reload(XDM_SERVICE_NAME)
+ Report.Warning(
+ _(
+ "Your display manager must be restarted.\n" +
+ "To take the changes in remote administration into account, \n" +
+ "please restart it manually or log out and log in again."
+ )
+ )
+ else
+ Report.Error(Message.CannotRestartService(XDM_SERVICE_NAME)) unless
Service.Restart(XDM_SERVICE_NAME)
+ end
+ end
+
# Restarts xinetd and xdm, reporting errors to the user
- def restart_service
- if @allow_administration
- # FIXME after SLES12 release: inittab is not used with systemd
- SCR.Write(path(".etc.inittab.id"), "5:initdefault:")
- SCR.Write(path(".etc.inittab"), nil)
+ def restart_services
+ if IsEnabled()
+ SystemdTarget.set_default(GRAPHICAL_TARGET)

- #if allow_administration is set to true, xinetd must be already
installed
Report.Error(Message.CannotRestartService(XINETD_SERVICE)) unless
Service.Restart(XINETD_SERVICE)
- Report.Error(Message.CannotRestartService(XDM_SERVICE_NAME)) unless
Service.Restart(XDM_SERVICE_NAME)
- else
- if have_xinetd
- # xinetd may be needed for other services so we never turn it
- # off. It will exit anyway if no services are configured.
- # If it is running, restart it.
- Service.Restart(XINETD_SERVICE) if Service.active?(XINETD_SERVICE)
- end
- end

- # do not call '$service reload' for gdm - use SuSEconfig
- # TODO: confirm that it's still needed
- # FIXME after SLES12 release: looks useless. SuSEconfig not longer used.
- if @default_dm != "gdm"
- Service.Reload(XDM_SERVICE_NAME)
+ restart_display_manager
+ else
+ # xinetd may be needed for other services so we never turn it
+ # off. It will exit anyway if no services are configured.
+ # If it is running, restart it.
+ Service.Reload(XINETD_SERVICE) if Service.active?(XINETD_SERVICE)
end
end

@@ -402,7 +406,7 @@
# @return summary text
def Summary
# description in proposal
- @allow_administration ? _("Remote administration is enabled.") :
_("Remote administration is disabled.")
+ IsEnabled() ? _("Remote administration is enabled.") : _("Remote
administration is disabled.")
end

publish :variable => :SEC_NONE, :type => "const string"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.97/test/remote_test.rb
new/yast2-network-3.1.99/test/remote_test.rb
--- old/yast2-network-3.1.97/test/remote_test.rb 2014-09-16
10:16:23.000000000 +0200
+++ new/yast2-network-3.1.99/test/remote_test.rb 2014-09-17
16:01:23.000000000 +0200
@@ -188,5 +188,63 @@
end
end
end
+
+ describe "#restart_services" do
+ context "when remote administration is being enabled" do
+ before(:each) do
+ Remote.Enable()
+ allow(Service).to
receive(:active?).with("display-manager").and_return(active_display_manager)
+ end
+
+ context "when display-manager service is active" do
+ let(:active_display_manager) { true }
+
+ it "adjusts xinetd and display-manager services and warns the user"
do
+ expect(SystemdTarget).to
receive(:set_default).with("graphical").and_return(true)
+ expect(Service).to
receive(:Restart).with("xinetd").and_return(true)
+ expect(Service).to
receive(:Reload).with("display-manager").and_return(true)
+ expect(Report).to receive(:Warning)
+ Remote.restart_services
+ end
+ end
+
+ context "when display-manager service is inactive" do
+ let(:active_display_manager) { false }
+
+ it "adjusts xinetd and display-manager services" do
+ expect(SystemdTarget).to
receive(:set_default).with("graphical").and_return(true)
+ expect(Service).to
receive(:Restart).with("xinetd").and_return(true)
+ expect(Service).to
receive(:Restart).with("display-manager").and_return(true)
+ Remote.restart_services
+ end
+ end
+ end
+
+ context "when remote adminitration is being disabled" do
+ before(:each) do
+ Remote.Disable()
+ allow(Service).to
receive(:active?).with("xinetd").and_return(active_xinetd)
+ end
+
+ context "xinetd is active" do
+ let(:active_xinetd) { true }
+
+ it "reloads the xinetd service" do
+ expect(Service).to receive(:Reload).with("xinetd").and_return(true)
+ Remote.restart_services
+ end
+ end
+
+ context "xinetd is inactive" do
+ let(:active_xinetd) { false }
+
+ it "does nothing with services" do
+ expect(Service).not_to receive(:Reload)
+ Remote.restart_services
+ end
+ end
+ end
+ end
+
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.97/test/routines_test.rb
new/yast2-network-3.1.99/test/routines_test.rb
--- old/yast2-network-3.1.97/test/routines_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-network-3.1.99/test/routines_test.rb 2014-09-17
16:01:23.000000000 +0200
@@ -0,0 +1,37 @@
+#! /usr/bin/env rspec
+
+ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+
+require "yast"
+
+include Yast
+
+Yast.include self, "network/routines.rb"
+
+Yast.import "Stage"
+Yast.import "Package"
+
+describe "#PackagesInstall" do
+ context "when list of packages is empty" do
+ it "returns :next without checking anything" do
+ expect(PackagesInstall([])).to eq(:next)
+ expect(Package).not_to receive(:InstalledAll)
+ end
+ end
+
+ context "in inst-sys" do
+ it "returns :next without checking anything" do
+ allow(Stage).to receive(:stage).and_return("initial")
+ expect(PackagesInstall(["1", "2", "3"])).to eq(:next)
+ expect(Package).not_to receive(:InstalledAll)
+ end
+ end
+
+ context "on a running system" do
+ it "checks whether all packages are installed and returns a symbol :next
or :abort" do
+ allow(Stage).to receive(:stage).and_return("normal")
+ expect(Package).to receive(:InstalledAll).and_return(true)
+ expect(PackagesInstall(["1", "2", "3"])).to eq(:next)
+ end
+ end
+end

continue with "q"...


Checked in at Wed Sep 17 17:15:02 CEST 2014 by ro

Remember to have fun...

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread