Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-dhcp-server for
openSUSE:Factory checked in at 2022-01-15 21:45:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-dhcp-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dhcp-server"
Sat Jan 15 21:45:04 2022 rev:63 rq:946189 version:4.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-dhcp-server/yast2-dhcp-server.changes
2021-04-23 17:50:36.822792944 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-dhcp-server.new.1892/yast2-dhcp-server.changes
2022-01-15 21:45:06.581611226 +0100
@@ -1,0 +2,8 @@
+Thu Jan 13 16:06:47 UTC 2022 - David Diaz <[email protected]>
+
+- Fix DNS zone creation by fixing a maintained DNS zone check.
+ Reported and fixed by Daniel P??tzold <[email protected]>
+ See github#yast/yast-dhcp-server#59.
+- 4.4.2
+
+-------------------------------------------------------------------
Old:
----
yast2-dhcp-server-4.4.1.tar.bz2
New:
----
yast2-dhcp-server-4.4.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dhcp-server.spec ++++++
--- /var/tmp/diff_new_pack.mHjjtZ/_old 2022-01-15 21:45:07.017611457 +0100
+++ /var/tmp/diff_new_pack.mHjjtZ/_new 2022-01-15 21:45:07.025611461 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-dhcp-server
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-dhcp-server
-Version: 4.4.1
+Version: 4.4.2
Release: 0
Summary: YaST2 - DHCP Server Configuration
License: GPL-2.0-only
++++++ yast2-dhcp-server-4.4.1.tar.bz2 -> yast2-dhcp-server-4.4.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-dhcp-server-4.4.1/.github/workflows/ci.yml
new/yast2-dhcp-server-4.4.2/.github/workflows/ci.yml
--- old/yast2-dhcp-server-4.4.1/.github/workflows/ci.yml 2021-04-21
09:43:57.000000000 +0200
+++ new/yast2-dhcp-server-4.4.2/.github/workflows/ci.yml 2022-01-13
17:58:12.000000000 +0100
@@ -8,7 +8,14 @@
jobs:
Tests:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "tumbleweed", "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
@@ -30,6 +37,8 @@
# send the coverage report to coveralls.io
- name: Coveralls Report
+ # send it only from the TW build to avoid duplicate submits
+ if: ${{ matrix.distro == 'tumbleweed' }}
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -49,7 +58,14 @@
Package:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "tumbleweed", "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
@@ -61,7 +77,14 @@
Yardoc:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
@@ -76,7 +99,14 @@
# checks into one job avoids that overhead
Checks:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-4.4.1/package/yast2-dhcp-server.changes
new/yast2-dhcp-server-4.4.2/package/yast2-dhcp-server.changes
--- old/yast2-dhcp-server-4.4.1/package/yast2-dhcp-server.changes
2021-04-21 09:43:57.000000000 +0200
+++ new/yast2-dhcp-server-4.4.2/package/yast2-dhcp-server.changes
2022-01-13 17:58:12.000000000 +0100
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Jan 13 16:06:47 UTC 2022 - David Diaz <[email protected]>
+
+- Fix DNS zone creation by fixing a maintained DNS zone check.
+ Reported and fixed by Daniel P??tzold <[email protected]>
+ See github#yast/yast-dhcp-server#59.
+- 4.4.2
+
+-------------------------------------------------------------------
Tue Apr 20 18:14:05 UTC 2021 - Dirk M??ller <[email protected]>
- stop packaging docdir, it only contained the license which
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-4.4.1/package/yast2-dhcp-server.spec
new/yast2-dhcp-server-4.4.2/package/yast2-dhcp-server.spec
--- old/yast2-dhcp-server-4.4.1/package/yast2-dhcp-server.spec 2021-04-21
09:43:57.000000000 +0200
+++ new/yast2-dhcp-server-4.4.2/package/yast2-dhcp-server.spec 2022-01-13
17:58:12.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-dhcp-server
-Version: 4.4.1
+Version: 4.4.2
Release: 0
Summary: YaST2 - DHCP Server Configuration
License: GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-4.4.1/src/include/dhcp-server/dns-server-dialogs.rb
new/yast2-dhcp-server-4.4.2/src/include/dhcp-server/dns-server-dialogs.rb
--- old/yast2-dhcp-server-4.4.1/src/include/dhcp-server/dns-server-dialogs.rb
2021-04-21 09:43:57.000000000 +0200
+++ new/yast2-dhcp-server-4.4.2/src/include/dhcp-server/dns-server-dialogs.rb
2022-01-13 17:58:12.000000000 +0100
@@ -27,10 +27,7 @@
return nil
end
- all_zones = DnsServerAPI.GetZones
-
- # found or not?
- Ops.get(all_zones, zone_name) == nil
+ DnsServerAPI.GetZones.keys.include?(zone_name)
end
def IsDNSZoneMaster(zone_name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-4.4.1/test/dns_server_dialog_test.rb
new/yast2-dhcp-server-4.4.2/test/dns_server_dialog_test.rb
--- old/yast2-dhcp-server-4.4.1/test/dns_server_dialog_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-dhcp-server-4.4.2/test/dns_server_dialog_test.rb 2022-01-13
17:58:12.000000000 +0100
@@ -0,0 +1,69 @@
+#!/usr/bin/env rspec
+
+# Copyright (c) [2022] SUSE LLC
+#
+# 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 SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "test_helper"
+
+Yast.import "DnsServerAPI"
+
+describe "DhcpServerDnsServerDialogsInclude" do
+ subject(:dialog) { TestDNSDialog.new }
+
+ class TestDNSDialog
+ include Yast::I18n
+
+ def initialize
+ Yast.include self, "dhcp-server/dns-server-dialogs.rb"
+ end
+ end
+
+ describe "#IsDNSZoneMaintained" do
+ before do
+ allow(Yast::DnsServerAPI).to receive(:GetZones).and_return(zones)
+ end
+
+ let(:zones) do
+ {
+ "example.org" => { "type" => "master" },
+ "forward.org" => { "type" => "forward" }
+ }
+ end
+
+ context "when a zone name is not given" do
+ it "returns nil" do
+ expect(dialog.IsDNSZoneMaintained(nil)).to be_nil
+ end
+ end
+
+ context "when a zone name is given" do
+ context "and it is included in maintained zones" do
+ it "returns true" do
+ expect(dialog.IsDNSZoneMaintained("example.org")).to eq(true)
+ end
+ end
+
+ context "but it is NOT included in maintained zones" do
+ it "returns false" do
+ expect(dialog.IsDNSZoneMaintained("not-maintained-zone.org")).to
eq(false)
+ end
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-dhcp-server-4.4.1/test/widgets_test.rb
new/yast2-dhcp-server-4.4.2/test/widgets_test.rb
--- old/yast2-dhcp-server-4.4.1/test/widgets_test.rb 2021-04-21
09:43:57.000000000 +0200
+++ new/yast2-dhcp-server-4.4.2/test/widgets_test.rb 2022-01-13
17:58:12.000000000 +0100
@@ -87,14 +87,13 @@
context "port is not opened" do
before do
+ allow(Yast::Report).to receive(:Error)
allow(Yast::UI).to receive(:QueryWidget).with(Id("open_port"),
:Value)
.and_return(false)
end
it "asks for continuing" do
expect(Yast::Popup).to receive(:YesNo).and_return(true)
- # validation can fail
- allow(Yast::Report).to receive(:Error)
expect(subject.OpenFirewallValidate("open_port",0)).to eq true
end
end
