Hello community,
here is the log from the commit of package yast2-dhcp-server for
openSUSE:Factory checked in at 2014-08-08 10:10:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-dhcp-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dhcp-server"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-dhcp-server/yast2-dhcp-server.changes
2014-03-31 20:45:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new/yast2-dhcp-server.changes
2014-08-08 10:13:41.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 7 08:36:22 UTC 2014 - mfi...@suse.com
+
+- bnc#887139
+ - selected device has to have an ip assigned.
+- 3.1.3
+
+-------------------------------------------------------------------
Old:
----
yast2-dhcp-server-3.1.2.tar.bz2
New:
----
yast2-dhcp-server-3.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dhcp-server.spec ++++++
--- /var/tmp/diff_new_pack.6UNGFl/_old 2014-08-08 10:13:42.000000000 +0200
+++ /var/tmp/diff_new_pack.6UNGFl/_new 2014-08-08 10:13:42.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-dhcp-server
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-dhcp-server-3.1.2.tar.bz2 -> yast2-dhcp-server-3.1.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-3.1.2/package/yast2-dhcp-server.changes
new/yast2-dhcp-server-3.1.3/package/yast2-dhcp-server.changes
--- old/yast2-dhcp-server-3.1.2/package/yast2-dhcp-server.changes
2014-03-31 13:32:49.000000000 +0200
+++ new/yast2-dhcp-server-3.1.3/package/yast2-dhcp-server.changes
2014-08-07 14:47:44.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Aug 7 08:36:22 UTC 2014 - mfi...@suse.com
+
+- bnc#887139
+ - selected device has to have an ip assigned.
+- 3.1.3
+
+-------------------------------------------------------------------
Mon Mar 31 13:24:17 CEST 2014 - loci...@suse.com
- Fixed testsuite (adapted to new systemd service)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-3.1.2/package/yast2-dhcp-server.spec
new/yast2-dhcp-server-3.1.3/package/yast2-dhcp-server.spec
--- old/yast2-dhcp-server-3.1.2/package/yast2-dhcp-server.spec 2014-03-31
13:32:49.000000000 +0200
+++ new/yast2-dhcp-server-3.1.3/package/yast2-dhcp-server.spec 2014-08-07
14:47:44.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-dhcp-server
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-3.1.2/src/include/dhcp-server/dialogs2.rb
new/yast2-dhcp-server-3.1.3/src/include/dhcp-server/dialogs2.rb
--- old/yast2-dhcp-server-3.1.2/src/include/dhcp-server/dialogs2.rb
2014-03-31 13:32:49.000000000 +0200
+++ new/yast2-dhcp-server-3.1.3/src/include/dhcp-server/dialogs2.rb
2014-08-07 14:47:44.000000000 +0200
@@ -588,38 +588,37 @@
nil
end
+ # Checks if selected devices are suitable to run dhcp server
+ #
+ # A device is valid when:
+ # - it has an IP already assigned
+ # - it has statically configured IP
def CardSelectionValidate(key, event)
- event = deep_copy(event)
- return true if Ops.get(event, "ID") == :abort
+ return true if event["ID"] == :abort
+ return false if !@ifaces
- allowed_interfaces = []
- configured_interfaces = []
- Builtins.foreach(@ifaces) do |iface, settings|
- if Ops.get_boolean(@ifaces, [iface, "active"], false) == true
- allowed_interfaces = Builtins.add(allowed_interfaces, iface)
- if DhcpServer.GetInterfaceInformation(iface) != {}
- configured_interfaces = Builtins.add(configured_interfaces, iface)
- end
- raise Break
- end
+ allowed_interfaces = @ifaces.select { |i, s| s && s["active"] }
+ unconfigured_interface = allowed_interfaces.any? do |iface, settings|
+ DhcpServer.GetInterfaceInformation(iface).empty?
end
- if Ops.less_or_equal(Builtins.size(allowed_interfaces), 0)
+
+ if allowed_interfaces.empty?
# TRANSLATORS: popup error, DHCP Server needs to run on one or more
interfaces,
# currently no one is selected
Report.Error(_("At least one network interface must be selected."))
return false
end
- if Ops.less_or_equal(Builtins.size(configured_interfaces), 0)
+ if unconfigured_interface
# TRANSLATORS: popup error, DHCP Server requires selected interface to
have
# at least minimal configuration
- return Popup.ContinueCancel(
+ Report.Error(
_(
- "The selected network interface is not configured (no assigned IP
address \n" +
- "and netmask). Using it in the DHCP server configuration may not
work.\n" +
- "Really use this interface?\n"
+ "One or more selected network interfaces is not configured (no
assigned IP address \n" +
+ "and netmask)."
)
)
+ return false
end
true
end
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
