Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at 2014-12-06 13:47:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes
2014-11-24 11:18:04.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes
2014-12-06 13:47:43.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Dec 4 09:50:29 UTC 2014 - jreidin...@suse.com
+
+- remove X-KDE-Library from desktop file (bnc#899104)
+
+-------------------------------------------------------------------
+Fri Nov 28 08:51:22 UTC 2014 - mfi...@suse.com
+
+- bnc#906694
+ - fixed exception raised due to modifying frozen string when
+ running in localized mode
+- 3.1.110
+
+-------------------------------------------------------------------
Old:
----
yast2-network-3.1.109.tar.bz2
New:
----
yast2-network-3.1.111.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.5aHi9n/_old 2014-12-06 13:47:44.000000000 +0100
+++ /var/tmp/diff_new_pack.5aHi9n/_new 2014-12-06 13:47:44.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.109
+Version: 3.1.111
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-network-3.1.109.tar.bz2 -> yast2-network-3.1.111.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.109/package/yast2-network.changes
new/yast2-network-3.1.111/package/yast2-network.changes
--- old/yast2-network-3.1.109/package/yast2-network.changes 2014-11-18
09:17:13.000000000 +0100
+++ new/yast2-network-3.1.111/package/yast2-network.changes 2014-12-04
11:22:49.000000000 +0100
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Thu Dec 4 09:50:29 UTC 2014 - jreidin...@suse.com
+
+- remove X-KDE-Library from desktop file (bnc#899104)
+
+-------------------------------------------------------------------
+Fri Nov 28 08:51:22 UTC 2014 - mfi...@suse.com
+
+- bnc#906694
+ - fixed exception raised due to modifying frozen string when
+ running in localized mode
+- 3.1.110
+
+-------------------------------------------------------------------
Fri Oct 17 07:45:24 UTC 2014 - mfi...@suse.com
- bnc#898250, bnc#899363
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.109/package/yast2-network.spec
new/yast2-network-3.1.111/package/yast2-network.spec
--- old/yast2-network-3.1.109/package/yast2-network.spec 2014-11-18
09:17:13.000000000 +0100
+++ new/yast2-network-3.1.111/package/yast2-network.spec 2014-12-04
11:22:49.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.109
+Version: 3.1.111
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-3.1.109/src/config/old-desktops/dns.desktop
new/yast2-network-3.1.111/src/config/old-desktops/dns.desktop
--- old/yast2-network-3.1.109/src/config/old-desktops/dns.desktop
2014-11-18 09:17:13.000000000 +0100
+++ new/yast2-network-3.1.111/src/config/old-desktops/dns.desktop
2014-12-04 11:22:49.000000000 +0100
@@ -4,7 +4,6 @@
X-KDE-ModuleType=Library
X-KDE-HasReadOnlyMode=true
-X-KDE-Library=yast2
X-SuSE-YaST-Call=dns
X-SuSE-YaST-Group=Net_advanced
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-3.1.109/src/config/old-desktops/routing.desktop
new/yast2-network-3.1.111/src/config/old-desktops/routing.desktop
--- old/yast2-network-3.1.109/src/config/old-desktops/routing.desktop
2014-11-18 09:17:13.000000000 +0100
+++ new/yast2-network-3.1.111/src/config/old-desktops/routing.desktop
2014-12-04 11:22:49.000000000 +0100
@@ -4,7 +4,6 @@
X-KDE-ModuleType=Library
X-KDE-HasReadOnlyMode=true
-X-KDE-Library=yast2
X-SuSE-YaST-Call=routing
X-SuSE-YaST-Group=Net_advanced
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.109/src/desktop/host.desktop
new/yast2-network-3.1.111/src/desktop/host.desktop
--- old/yast2-network-3.1.109/src/desktop/host.desktop 2014-11-18
09:17:13.000000000 +0100
+++ new/yast2-network-3.1.111/src/desktop/host.desktop 2014-12-04
11:22:49.000000000 +0100
@@ -4,7 +4,6 @@
X-KDE-ModuleType=Library
X-KDE-HasReadOnlyMode=true
-X-KDE-Library=yast2
X-SuSE-YaST-Call=host
X-SuSE-YaST-Group=Net_advanced
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.109/src/desktop/lan.desktop
new/yast2-network-3.1.111/src/desktop/lan.desktop
--- old/yast2-network-3.1.109/src/desktop/lan.desktop 2014-11-18
09:17:13.000000000 +0100
+++ new/yast2-network-3.1.111/src/desktop/lan.desktop 2014-12-04
11:22:49.000000000 +0100
@@ -4,7 +4,6 @@
X-KDE-ModuleType=Library
X-KDE-HasReadOnlyMode=true
-X-KDE-Library=yast2
X-SuSE-YaST-Call=lan
X-SuSE-YaST-Group=Network
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.109/src/desktop/network.desktop
new/yast2-network-3.1.111/src/desktop/network.desktop
--- old/yast2-network-3.1.109/src/desktop/network.desktop 2014-11-18
09:17:13.000000000 +0100
+++ new/yast2-network-3.1.111/src/desktop/network.desktop 2014-12-04
11:22:49.000000000 +0100
@@ -4,7 +4,6 @@
X-KDE-ModuleType=Library
X-KDE-HasReadOnlyMode=true
-X-KDE-Library=yast2
X-SuSE-YaST-Call=network
X-SuSE-YaST-Group=Net_advanced
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.109/src/desktop/remote.desktop
new/yast2-network-3.1.111/src/desktop/remote.desktop
--- old/yast2-network-3.1.109/src/desktop/remote.desktop 2014-11-18
09:17:13.000000000 +0100
+++ new/yast2-network-3.1.111/src/desktop/remote.desktop 2014-12-04
11:22:49.000000000 +0100
@@ -4,7 +4,6 @@
X-KDE-ModuleType=Library
X-KDE-HasReadOnlyMode=true
-X-KDE-Library=yast2
X-SuSE-YaST-Call=remote
X-SuSE-YaST-Group=Net_advanced
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.109/src/include/network/complex.rb
new/yast2-network-3.1.111/src/include/network/complex.rb
--- old/yast2-network-3.1.109/src/include/network/complex.rb 2014-11-18
09:17:13.000000000 +0100
+++ new/yast2-network-3.1.111/src/include/network/complex.rb 2014-12-04
11:22:49.000000000 +0100
@@ -346,7 +346,7 @@
host = NetHwDetection.ResolveIP(addr)
remip = Ops.get_string(devmap, "REMOTE_IPADDR", "")
if proto == "none"
- return _("Configured without address (NONE)")
+ return _("Configured without address (NONE)").dup
elsif IsEmpty(addr)
# Network card status
return HTML.Colorize(_("Configured without an address"), "red")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.109/src/modules/LanItems.rb
new/yast2-network-3.1.111/src/modules/LanItems.rb
--- old/yast2-network-3.1.109/src/modules/LanItems.rb 2014-11-18
09:17:13.000000000 +0100
+++ new/yast2-network-3.1.111/src/modules/LanItems.rb 2014-12-04
11:22:49.000000000 +0100
@@ -586,7 +586,7 @@
# Tells if current item was renamed
def renamed?(item_id)
- return false if !@Items[item_id].has_key?("renamed_to")
+ return false if !LanItems.Items[item_id].has_key?("renamed_to")
renamed_to(item_id) != GetDeviceName(item_id)
end
@@ -1310,44 +1310,37 @@
overview = []
links = []
- Builtins.foreach(
- Convert.convert(
- Map.Keys(@Items),
- :from => "list",
- :to => "list <integer>"
- )
- ) do |key|
+ LanItems.Items.each_key do |key|
rich = ""
ip = _("Not configured")
- item_hwinfo = @Items[key]["hwinfo"] || {}
+ item_hwinfo = LanItems.Items[key]["hwinfo"] || {}
descr = item_hwinfo["name"] || ""
note = ""
bullets = []
- ifcfg_name = @Items[key]["ifcfg"] || ""
+ ifcfg_name = LanItems.Items[key]["ifcfg"] || ""
- @type = NetworkInterfaces.GetType(ifcfg_name)
+ LanItems.type = NetworkInterfaces.GetType(ifcfg_name)
if !ifcfg_name.empty?
- NetworkInterfaces.Select(ifcfg_name)
-
- ifcfg_desc = GetDeviceMap(key)["NAME"]
+ ifcfg_conf = GetDeviceMap(key)
+ ifcfg_desc = ifcfg_conf["NAME"]
descr = ifcfg_desc if !ifcfg_desc.nil? && !ifcfg_desc.empty?
- descr = CheckEmptyName(@type, descr)
- ip = DeviceProtocol(NetworkInterfaces.Current)
+ descr = CheckEmptyName(LanItems.type, descr)
+ ip = DeviceProtocol(ifcfg_conf)
status = DeviceStatus(
- @type,
- NetworkInterfaces.device_num(NetworkInterfaces.Name),
- NetworkInterfaces.Current
+ LanItems.type,
+ ifcfg_name,
+ ifcfg_conf
)
bullets << _("Device Name: %s") % ifcfg_name
bullets = bullets + startmode_overview
- bullets = bullets + ip_overview(ip) if
NetworkInterfaces.Current["STARTMODE"] != "managed"
+ bullets = bullets + ip_overview(ip) if ifcfg_conf["STARTMODE"] !=
"managed"
- if @type == "wlan" &&
- NetworkInterfaces.Current["WIRELESS_AUTH_MODE"] == "open" &&
- IsEmpty(NetworkInterfaces.Current["WIRELESS_KEY_0"])
+ if LanItems.type == "wlan" &&
+ ifcfg_conf["WIRELESS_AUTH_MODE"] == "open" &&
+ IsEmpty(ifcfg_conf["WIRELESS_KEY_0"])
# avoid colons
ifcfg_name = ifcfg_name.tr(":", "/")
@@ -1359,7 +1352,7 @@
links << href
end
- if @type == "bond"
+ if LanItems.type == "bond"
bond_slaves_desc = ("%s: %s") % [
_("Bonding slaves"),
GetBondSlaves(ifcfg_name).join(" ")
@@ -1386,7 +1379,7 @@
overview << Summary.Device(descr, status)
else
- descr = CheckEmptyName(@type, descr)
+ descr = CheckEmptyName(LanItems.type, descr)
overview << Summary.Device(descr, Summary.NotConfigured)
end
conn = ""
@@ -1430,7 +1423,7 @@
end
@current = curr
end
- @Items[key]["table_descr"] = {
+ LanItems.Items[key]["table_descr"] = {
"rich_descr" => rich,
"table_descr" => [descr, ip, ifcfg_name, note]
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.109/test/Makefile.am
new/yast2-network-3.1.111/test/Makefile.am
--- old/yast2-network-3.1.109/test/Makefile.am 2014-11-18 09:17:13.000000000
+0100
+++ new/yast2-network-3.1.111/test/Makefile.am 2014-12-04 11:22:49.000000000
+0100
@@ -19,6 +19,7 @@
udev_test.rb \
ifroute_test.rb \
s390_helpers_test.rb \
+ build_lan_overview_test.rb \
remote_test.rb
TEST_EXTENSIONS = .rb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-3.1.109/test/build_lan_overview_test.rb
new/yast2-network-3.1.111/test/build_lan_overview_test.rb
--- old/yast2-network-3.1.109/test/build_lan_overview_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-network-3.1.111/test/build_lan_overview_test.rb 2014-12-04
11:22:49.000000000 +0100
@@ -0,0 +1,67 @@
+#!/usr/bin/env rspec
+
+require_relative "test_helper"
+
+require "yast"
+
+Yast.import "LanItems"
+
+include Yast::UIShortcuts
+include Yast::I18n
+
+describe "LanItemsClass#BuildLanOverview" do
+ let(:unknown_device_overview) {
+ ["<ul><li><p>Unknown Network Device<br>Not configured yet.</p></li></ul>",
[]]
+ }
+ let(:german_translation_overview) {
+ [
+ "<ul><li><p>WiFi Link 6000 Series<br>Ohne Adresse konfiguriert (KEINE)
<font color=\"red\">Warnung: Es wird keine Verschl\u00FCsselung
verwendet.</font> <a href=\"lan--wifi-encryption-wlan0\">\u00C4ndern Sie
dies.</a></p></li></ul>",
+ ["lan--wifi-encryption-wlan0"]
+ ]
+ }
+ let(:wlan_items) {
+ {
+ 0 => {
+ "ifcfg" => "wlan0"
+ }
+ }
+ }
+ let(:wlan_ifcfg) {
+ {
+ "BOOTPROTO" => "none",
+ "NAME" => "WiFi Link 6000 Series",
+ "WIRELESS_AUTH_MODE" => "open",
+ "WIRELESS_KEY_0" => ""
+ }
+ }
+
+ # targeted mainly against bnc#906694
+ it "returns translated network device textual description for wlan device" do
+ allow(Yast::LanItems)
+ .to receive(:Items)
+ .and_return(wlan_items)
+ allow(Yast::LanItems)
+ .to receive(:GetDeviceMap)
+ .and_return(wlan_ifcfg)
+ allow(Yast::NetworkInterfaces)
+ .to receive(:Current)
+ .and_return(wlan_ifcfg)
+ allow(FastGettext)
+ .to receive(:locale)
+ .and_return("de")
+
+ # hack locale search path
+ Yast::I18n::LOCALE_DIR = File.expand_path("../locale", __FILE__)
+
+ textdomain("network")
+
+ # other checks depends on this
+ # - output of BuildLanOverview changes according number of devices
+ # even for "failing" (unknown devices) path
+ expect(Yast::LanItems.Items.size).to eql 1
+
+ overview = Yast::LanItems.BuildLanOverview
+ expect(overview).not_to eql unknown_device_overview
+ expect(overview).to eql german_translation_overview
+ end
+end
Files old/yast2-network-3.1.109/test/locale/de/LC_MESSAGES/network.mo and
new/yast2-network-3.1.111/test/locale/de/LC_MESSAGES/network.mo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.109/test/locale/de/network.po
new/yast2-network-3.1.111/test/locale/de/network.po
--- old/yast2-network-3.1.109/test/locale/de/network.po 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-network-3.1.111/test/locale/de/network.po 2014-12-04
11:22:49.000000000 +0100
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-18 11:54+0000\n"
+"PO-Revision-Date: 2014-08-18 11:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <l...@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Configured without address (NONE)"
+msgstr "Ohne Adresse konfiguriert (KEINE)"
+
+msgid "Warning: no encryption is used."
+msgstr "Warnung: Es wird keine Verschlüsselung verwendet."
+
+msgid "Change."
+msgstr "Ändern Sie dies."
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
