YaST Commits
Threads by month
- ----- 2024 -----
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
April 2014
- 13 participants
- 917 discussions
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# 868187 : "ssh installation results in duplicate network route entries" (NEW/)
## BNC# 872089 : "/firewall_stage1_proposal.rb:31 warning: already initialized constant Yast::FirewallStage1ProposalClient::PROPOSAL_ID" (RESOLVED/FIXED)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-04-03 09:05:28.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-04-07 11:39:51.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Apr 4 13:12:27 UTC 2014 - mfilka(a)suse.com
+
+- bnc#868187
+ - implemented heuristics for setting DHCLIENT_SET_DEFAULT_ROUTE
+ during autoconfiguration in installation
+-3.1.46
+
+-------------------------------------------------------------------
+Fri Apr 4 12:41:36 UTC 2014 - jreidinger(a)suse.com
+
+- avoid client redefinition warning (bnc#872089)
+- 3.1.45
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-network
- at least 15 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old)
and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:35586 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-network-3.1.44.tar.bz2
New:
----
yast2-network-3.1.46.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.bD9P7W/_old 2014-04-09 17:10:56.000000000 +0200
+++ /var/tmp/diff_new_pack.bD9P7W/_new 2014-04-09 17:10:56.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.44
+Version: 3.1.46
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-network-3.1.44.tar.bz2 -> yast2-network-3.1.46.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.44/package/yast2-network.changes new/yast2-network-3.1.46/package/yast2-network.changes
--- old/yast2-network-3.1.44/package/yast2-network.changes 2014-04-02 16:23:21.000000000 +0200
+++ new/yast2-network-3.1.46/package/yast2-network.changes 2014-04-07 11:33:54.000000000 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Fri Apr 4 13:12:27 UTC 2014 - mfilka(a)suse.com
+
+- bnc#868187
+ - implemented heuristics for setting DHCLIENT_SET_DEFAULT_ROUTE
+ during autoconfiguration in installation
+-3.1.46
+
+-------------------------------------------------------------------
+Fri Apr 4 12:41:36 UTC 2014 - jreidinger(a)suse.com
+
+- avoid client redefinition warning (bnc#872089)
+- 3.1.45
+
+-------------------------------------------------------------------
Wed Apr 2 13:22:18 UTC 2014 - mfilka(a)suse.com
- bnc#869199
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.44/package/yast2-network.spec new/yast2-network-3.1.46/package/yast2-network.spec
--- old/yast2-network-3.1.44/package/yast2-network.spec 2014-04-02 16:23:21.000000000 +0200
+++ new/yast2-network-3.1.46/package/yast2-network.spec 2014-04-07 11:33:54.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.44
+Version: 3.1.46
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.44/src/clients/firewall_stage1_proposal.rb new/yast2-network-3.1.46/src/clients/firewall_stage1_proposal.rb
--- old/yast2-network-3.1.44/src/clients/firewall_stage1_proposal.rb 2014-04-02 16:23:21.000000000 +0200
+++ new/yast2-network-3.1.46/src/clients/firewall_stage1_proposal.rb 2014-04-07 11:33:54.000000000 +0200
@@ -368,7 +368,7 @@
Wizard.CloseDialog
Convert.to_symbol(dialog_ret)
end
- end
+ end unless defined? FirewallStage1ProposalClient
end
Yast::FirewallStage1ProposalClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.44/src/clients/inst_lan.rb new/yast2-network-3.1.46/src/clients/inst_lan.rb
--- old/yast2-network-3.1.44/src/clients/inst_lan.rb 2014-04-02 16:23:21.000000000 +0200
+++ new/yast2-network-3.1.46/src/clients/inst_lan.rb 2014-04-07 11:33:55.000000000 +0200
@@ -35,18 +35,16 @@
def main
Yast.import "UI"
- Yast.import "Label"
- Yast.import "Lan"
- Yast.import "RichText"
+ Yast.import "LanItems"
Yast.import "GetInstArgs"
+ Yast.include self, "network/lan/wizards.rb"
+
textdomain "network"
log.info("----------------------------------------")
log.info("Lan module started")
- Yast.include self, "network/lan/cmdline.rb"
- Yast.include self, "network/lan/wizards.rb"
manual_conf_request = GetInstArgs.argmap["skip_detection"] || false
log.info("Lan module forces manual configuration: #{manual_conf_request}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.44/src/clients/inst_setup_dhcp.rb new/yast2-network-3.1.46/src/clients/inst_setup_dhcp.rb
--- old/yast2-network-3.1.44/src/clients/inst_setup_dhcp.rb 2014-04-02 16:23:21.000000000 +0200
+++ new/yast2-network-3.1.46/src/clients/inst_setup_dhcp.rb 2014-04-07 11:33:55.000000000 +0200
@@ -1,10 +1,12 @@
-Yast.import "LanItems"
-Yast.import "NetworkInterfaces"
#enclose client into own namespace to prevent messing global namespace
module SetupDHCPClient
+
include Yast
+ Yast.import "LanItems"
+ Yast.import "NetworkInterfaces"
+
BASH_PATH = Path.new(".target.bash")
def self.network_cards
@@ -57,6 +59,9 @@
def self.activate_changes(devnames)
return false if !write_configuration
+ # workaround for gh#yast/yast-core#74 (https://github.com/yast/yast-core/issues/74)
+ NetworkInterfaces.CleanCacheRead()
+
devnames.map { |d| reload_config(d) }
end
@@ -78,6 +83,42 @@
SCR.Execute(BASH_PATH, wicked_query) == 0
end
+ # Returns list of servers used for internet reachability test
+ #
+ # Basicaly servers with product release notes should be used.
+ def self.target_servers
+ ["scc.suse.com"]
+ end
+
+ # Check if given device can reach some of reference servers
+ def self.set_default_route_flag_if_wan_dev?(devname)
+ set_default_route_flag(devname, "yes")
+ activate_changes([devname])
+
+ reached = target_servers.any? do |server|
+ ping_cmd = "ping -I #{devname} -c 3 #{server}"
+ SCR.Execute(BASH_PATH, ping_cmd) == 0
+ end
+
+ log.info("Release notes can be reached via #{devname}: #{reached}")
+
+ if !reached
+ set_default_route_flag(devname, "no")
+ activate_changes([devname])
+ end
+
+ reached
+ end
+
+ # Sets sysconfig's DHCLIENT_SET_DEFAULT_ROUTE option for given device
+ #
+ # @param [String] devname name of device as seen by system (e.g. enp0s3)
+ # @param [String] value "yes" or "no", as in sysconfig
+ def self.set_default_route_flag(devname, value)
+ item_id = LanItems.FindDeviceIndex(devname)
+ LanItems.SetItemSysconfigOpt(item_id, "DHCLIENT_SET_DEFAULT_ROUTE", value)
+ end
+
include Logger
dhcp_cards = network_cards.select { |c| !configured?(c) }
@@ -88,15 +129,26 @@
activate_changes(dhcp_cards)
- # workaround for gh#yast/yast-core#74 (https://github.com/yast/yast-core/issues/74)
- NetworkInterfaces.CleanCacheRead()
-
# drop devices without dhcp lease
inactive_devices = dhcp_cards.select { |c| ! active_config?(c) }
log.info "Inactive devices: #{inactive_devices}"
inactive_devices.each { |c| delete_config(c) }
- activate_changes(inactive_devices)
+
+ # setup route flag
+ active_devices = dhcp_cards - inactive_devices
+
+ if active_devices.size == 1
+ # just one dhcp device, nothing to care of
+ set_default_route_flag(active_devices.first, "yes")
+ else
+ # try to find just one dhcp aware device for allowing default route
+ # if there is more than one dhcp devices enabled for setting default
+ # route (DHCLIENT_SET_DEFAULT_ROUTE = "yes"). bnc#868187
+ active_devices.find { |d| set_default_route_flag_if_wan_dev?(d) }
+ end
+
+ activate_changes(dhcp_cards)
end
:next
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.44/src/clients/lan.rb new/yast2-network-3.1.46/src/clients/lan.rb
--- old/yast2-network-3.1.44/src/clients/lan.rb 2014-04-02 16:23:21.000000000 +0200
+++ new/yast2-network-3.1.46/src/clients/lan.rb 2014-04-07 11:33:55.000000000 +0200
@@ -194,14 +194,8 @@
}
}
- begin
- @ret = CommandLine.Run(@cmdline)
- Builtins.y2debug("ret=%1", @ret)
- rescue Exception => e
- Report.Error(_("Internal error. Please report a bug."))
- Builtins.y2internal("LanClient exception:")
- Builtins.y2internal(e.backtrace.inspect)
- end
+ @ret = CommandLine.Run(@cmdline)
+ Builtins.y2debug("ret=%1", @ret)
# Finish
Builtins.y2milestone("Lan module finished")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.44/src/include/network/lan/address.rb new/yast2-network-3.1.46/src/include/network/lan/address.rb
--- old/yast2-network-3.1.44/src/include/network/lan/address.rb 2014-04-02 16:23:21.000000000 +0200
+++ new/yast2-network-3.1.46/src/include/network/lan/address.rb 2014-04-07 11:33:55.000000000 +0200
@@ -168,8 +168,6 @@
)
},
"IFCFGID" =>
- # "valid_chars": NetworkInterfaces::ValidCharsIfcfg (),
- # "handle": HandleIfcfg,
{
"widget" => :textentry,
# ComboBox label
@@ -181,7 +179,6 @@
"TUNNEL" => {
"widget" => :custom,
"custom_widget" => VBox(
- Left(CheckBox(Id(:persistent), _("Persistent Tunnel"))),
HBox(
InputField(Id(:owner), _("Tunnel owner")),
InputField(Id(:group), _("Tunnel group"))
@@ -758,11 +755,6 @@
def initTunnel(key)
Builtins.y2internal("initTunnel %1", @settings)
UI.ChangeWidget(
- :persistent,
- :Value,
- Ops.get_string(@settings, "TUNNEL_SET_PERSISTENT", "") == "yes"
- )
- UI.ChangeWidget(
:owner,
:Value,
Ops.get_string(@settings, "TUNNEL_SET_OWNER", "")
@@ -780,11 +772,6 @@
event = deep_copy(event)
Ops.set(
@settings,
- "TUNNEL_SET_PERSISTENT",
- Convert.to_boolean(UI.QueryWidget(:persistent, :Value)) ? "yes" : "no"
- )
- Ops.set(
- @settings,
"TUNNEL_SET_OWNER",
Convert.to_string(UI.QueryWidget(:owner, :Value))
)
@@ -1386,7 +1373,6 @@
"BOOTPROTO" => "static",
"STARTMODE" => "auto",
"TUNNEL" => LanItems.type,
- "TUNNEL_SET_PERSISTENT" => LanItems.tunnel_set_persistent ? "yes" : "no",
"TUNNEL_SET_OWNER" => LanItems.tunnel_set_owner,
"TUNNEL_SET_GROUP" => LanItems.tunnel_set_group
}
@@ -1605,11 +1591,6 @@
elsif LanItems.type == "br"
LanItems.bridge_ports = Ops.get_string(@settings, "BRIDGE_PORTS", "")
elsif Builtins.contains(["tun", "tap"], LanItems.type)
- LanItems.tunnel_set_persistent = Ops.get_string(
- @settings,
- "TUNNEL_SET_PERSISTENT",
- ""
- ) == "yes"
LanItems.tunnel_set_owner = Ops.get_string(
@settings,
"TUNNEL_SET_OWNER",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.44/src/include/network/lan/complex.rb new/yast2-network-3.1.46/src/include/network/lan/complex.rb
--- old/yast2-network-3.1.44/src/include/network/lan/complex.rb 2014-04-02 16:23:21.000000000 +0200
+++ new/yast2-network-3.1.46/src/include/network/lan/complex.rb 2014-04-07 11:33:55.000000000 +0200
@@ -511,6 +511,16 @@
when :add
LanItems.AddNew
Lan.Add
+
+ # FIXME: This is for backward compatibility only
+ # dhclient needs to set just one dhcp enabled interface to
+ # DHCLIENT_SET_DEFAULT_ROUTE=yes. Otherwise interface is selected more
+ # or less randomly (bnc#868187). However, UI is not ready for such change yet.
+ # As it could easily happen that all interfaces are set to "no" (and
+ # default route is unrecheable in such case) this explicite setup was
+ # added.
+ LanItems.set_default_route = true
+
return :add
when :edit
if LanItems.IsCurrentConfigured
@@ -543,6 +553,15 @@
return nil
end
+ # FIXME: This is for backward compatibility only
+ # dhclient needs to set just one dhcp enabled interface to
+ # DHCLIENT_SET_DEFAULT_ROUTE=yes. Otherwise interface is selected more
+ # or less randomly (bnc#868187). However, UI is not ready for such change yet.
+ # As it could easily happen that all interfaces are set to "no" (and
+ # default route is unrecheable in such case) this explicite setup was
+ # added.
+ LanItems.set_default_route = true
+
if !DeviceReady(
Ops.get_string(
LanItems.getCurrentItem,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.44/src/modules/LanItems.rb new/yast2-network-3.1.46/src/modules/LanItems.rb
--- old/yast2-network-3.1.44/src/modules/LanItems.rb 2014-04-02 16:23:21.000000000 +0200
+++ new/yast2-network-3.1.46/src/modules/LanItems.rb 2014-04-07 11:33:56.000000000 +0200
@@ -171,7 +171,6 @@
# for TUN / TAP devices
- @tunnel_set_persistent = true
@tunnel_set_owner = ""
@tunnel_set_group = ""
@@ -231,6 +230,7 @@
"REMOTE_IPADDR" => "",
"NETMASK" => "",
"MTU" => "",
+ "DHCLIENT_SET_DEFAULT_ROUTE" => "no",
"LLADDR" => "00:00:00:00:00:00",
"ETHTOOL_OPTIONS" => "",
"NAME" => "",
@@ -272,7 +272,6 @@
# defaults for tun/tap devices
"TUNNEL_SET_OWNER" => "",
"TUNNEL_SET_GROUP" => "",
- "TUNNEL_SET_PERSISTENT" => "yes",
# Infiniband
# default mode for IPoIB devices suggested in fate#315501
"IPOIB_MODE" => "connected"
@@ -376,6 +375,28 @@
GetDeviceMap(@current)
end
+ # Sets item's sysconfig device map to given one
+ #
+ # It updates NetworkInterfaces according given map. Map is expected
+ # to be a hash where both key even value are strings
+ def SetDeviceMap(item_id, devmap)
+ devname = GetDeviceName(item_id)
+ return false if devname.nil? || devname.empty?
+
+ NetworkInterfaces.Change2(devname, devmap, false)
+ end
+
+ # Sets one option in items sysconfig device map
+ #
+ # Currently no checks on sysconfig option validity are performed
+ def SetItemSysconfigOpt(item_id, opt, value)
+ devmap = GetDeviceMap(item_id)
+ return false if devmap.nil?
+
+ devmap[opt] = value
+ SetDeviceMap(item_id, devmap)
+ end
+
# Returns udev rule known for particular item
def GetItemUdevRule(itemId)
Ops.get_list(GetLanItem(itemId), ["udev", "net"], [])
@@ -663,8 +684,8 @@
end
def AddNew
- @current = Builtins.size(@Items)
- Ops.set(@Items, @current, { "commited" => false })
+ @current = @Items.to_h.size
+ @Items[@current] = { "commited" => false }
@operation = :add
nil
@@ -1582,6 +1603,7 @@
@prefix = GetDeviceVar(devmap, defaults, "PREFIXLEN")
@remoteip = GetDeviceVar(devmap, defaults, "REMOTE_IPADDR")
@netmask = GetDeviceVar(devmap, defaults, "NETMASK")
+ @set_default_route = GetDeviceVar(devmap, defaults, "DHCLIENT_SET_DEFAULT_ROUTE") == "yes"
@mtu = GetDeviceVar(devmap, defaults, "MTU")
@ethtool_options = GetDeviceVar(devmap, defaults, "ETHTOOL_OPTIONS")
@@ -1606,11 +1628,6 @@
# tun/tap settings
@tunnel_set_owner = GetDeviceVar(devmap, defaults, "TUNNEL_SET_OWNER")
@tunnel_set_group = GetDeviceVar(devmap, defaults, "TUNNEL_SET_GROUP")
- @tunnel_set_persistent = GetDeviceVar(
- devmap,
- defaults,
- "TUNNEL_SET_PERSISTENT"
- ) == "yes"
# wireless options
@wl_mode = GetDeviceVar(devmap, defaults, "WIRELESS_MODE")
@@ -1836,218 +1853,219 @@
true
end
+ # Sets device map items related to dhclient
+ def setup_dhclient_options(devmap)
+ devmap["DHCLIENT_SET_DEFAULT_ROUTE"] = @set_default_route ? "yes" : "no" if isCurrentDHCP
+
+ return devmap
+ end
+
+ # Sets device map items for device when it is not alias
+ def setup_basic_device_options(devmap)
+ return devmap if !(a)alias.empty?
+
+ devmap["MTU"] = @mtu
+ devmap["ETHTOOL_OPTIONS"] = @ethtool_options
+ devmap["STARTMODE"] = @startmode
+ devmap["IFPLUGD_PRIORITY"] = @ifplugd_priority.to_i if @startmode == "ifplugd"
+ devmap["BOOTPROTO"] = @bootproto
+ devmap["_aliases"] = @aliases
+
+ log.info("aliases #{@aliases}")
+
+ devmap
+ end
+
# Commit pending operation
# @return true if success
def Commit
- if @operation == :add || @operation == :edit
- newdev = {}
-
- # #104494 - always write IPADDR+NETMASK, even empty
- Ops.set(newdev, "IPADDR", @ipaddr)
- if Ops.greater_than(Builtins.size(@prefix), 0)
- Ops.set(newdev, "PREFIXLEN", @prefix)
- else
- Ops.set(newdev, "NETMASK", @netmask)
- end
- # #50955 omit computable fields
- Ops.set(newdev, "BROADCAST", "")
- Ops.set(newdev, "NETWORK", "")
-
- Ops.set(newdev, "REMOTE_IPADDR", @remoteip)
-
- # set LLADDR to sysconfig only for device on layer2 and only these which needs it
- if @qeth_layer2
- busid = Ops.get_string(@Items, [@current, "hwinfo", "busid"], "")
- # sysfs id has changed from css0...
- sysfs_id = Ops.add("/devices/qeth/", busid)
- Builtins.y2milestone("busid %1", busid)
- if s390_device_needs_persistent_mac(sysfs_id, @Hardware)
- Ops.set(newdev, "LLADDR", @qeth_macaddress)
- end
- end
+ if @operation != :add && @operation != :edit
+ Builtins.y2error("Unknown operation: %1", @operation)
+ raise ArgumentError, "Unknown operation: #{@operation}"
+ end
- if @alias == ""
- Ops.set(newdev, "MTU", @mtu)
- Ops.set(newdev, "ETHTOOL_OPTIONS", @ethtool_options)
- Ops.set(newdev, "STARTMODE", @startmode)
- # it is not in Select yet because we don't have a widget for it
- if @startmode == "ifplugd"
- if @ifplugd_priority != nil
- Ops.set(newdev, "IFPLUGD_PRIORITY", @ifplugd_priority)
- else
- Ops.set(
- newdev,
- "IFPLUGD_PRIORITY",
- Ops.get(@ifplugd_priorities, @type, "0")
- )
- end
- end
- Ops.set(newdev, "BOOTPROTO", @bootproto)
- end
- Ops.set(newdev, "NAME", @description)
+ newdev = {}
- Ops.set(newdev, "DHCLIENT_SET_DOWN_LINK", "yes") if @hotplug == "pcmcia"
+ # #104494 - always write IPADDR+NETMASK, even empty
+ Ops.set(newdev, "IPADDR", @ipaddr)
+ if Ops.greater_than(Builtins.size(@prefix), 0)
+ Ops.set(newdev, "PREFIXLEN", @prefix)
+ else
+ Ops.set(newdev, "NETMASK", @netmask)
+ end
+ # #50955 omit computable fields
+ Ops.set(newdev, "BROADCAST", "")
+ Ops.set(newdev, "NETWORK", "")
+ Ops.set(newdev, "REMOTE_IPADDR", @remoteip)
- case @type
- when "bond"
- i = 0
- Builtins.foreach(@bond_slaves) do |slave|
- Ops.set(newdev, Builtins.sformat("BONDING_SLAVE%1", i), slave)
- i = Ops.add(i, 1)
- end
+ # set LLADDR to sysconfig only for device on layer2 and only these which needs it
+ if @qeth_layer2
+ busid = Ops.get_string(@Items, [@current, "hwinfo", "busid"], "")
+ # sysfs id has changed from css0...
+ sysfs_id = Ops.add("/devices/qeth/", busid)
+ Builtins.y2milestone("busid %1", busid)
+ if s390_device_needs_persistent_mac(sysfs_id, @Hardware)
+ Ops.set(newdev, "LLADDR", @qeth_macaddress)
+ end
+ end
- #assign nil to rest BONDING_SLAVEn to remove them
- while Ops.less_than(i, @MAX_BOND_SLAVE)
- Ops.set(newdev, Builtins.sformat("BONDING_SLAVE%1", i), nil)
- i = Ops.add(i, 1)
- end
+ newdev["NAME"] = @description
- Ops.set(newdev, "BONDING_MODULE_OPTS", @bond_option)
+ newdev = setup_basic_device_options(newdev)
+ newdev = setup_dhclient_options(newdev)
- #BONDING_MASTER always is yes
- Ops.set(newdev, "BONDING_MASTER", "yes")
+ case @type
+ when "bond"
+ i = 0
+ Builtins.foreach(@bond_slaves) do |slave|
+ Ops.set(newdev, Builtins.sformat("BONDING_SLAVE%1", i), slave)
+ i = Ops.add(i, 1)
+ end
+
+ #assign nil to rest BONDING_SLAVEn to remove them
+ while Ops.less_than(i, @MAX_BOND_SLAVE)
+ Ops.set(newdev, Builtins.sformat("BONDING_SLAVE%1", i), nil)
+ i = Ops.add(i, 1)
+ end
+
+ Ops.set(newdev, "BONDING_MODULE_OPTS", @bond_option)
+
+ #BONDING_MASTER always is yes
+ Ops.set(newdev, "BONDING_MASTER", "yes")
+
+ when "vlan"
+ Ops.set(newdev, "ETHERDEVICE", @vlan_etherdevice)
+ Ops.set(newdev, "VLAN_ID", @vlan_id)
+
+ when "br"
+ Ops.set(newdev, "BRIDGE_PORTS", @bridge_ports)
+ Ops.set(newdev, "BRIDGE", "yes")
+ Ops.set(newdev, "BRIDGE_STP", "off")
+ Ops.set(newdev, "BRIDGE_FORWARDDELAY", "0")
+
+ when "wlan"
+ Ops.set(newdev, "WIRELESS_MODE", @wl_mode)
+ Ops.set(newdev, "WIRELESS_ESSID", @wl_essid)
+ Ops.set(newdev, "WIRELESS_NWID", @wl_nwid)
+ Ops.set(newdev, "WIRELESS_AUTH_MODE", @wl_auth_mode)
+ Ops.set(newdev, "WIRELESS_WPA_PSK", @wl_wpa_psk)
+ Ops.set(newdev, "WIRELESS_KEY_LENGTH", @wl_key_length)
+ # obsoleted by WIRELESS_KEY_0
+ Ops.set(newdev, "WIRELESS_KEY", "") # TODO: delete the varlable
+ Ops.set(newdev, "WIRELESS_KEY_0", Ops.get(@wl_key, 0, ""))
+ Ops.set(newdev, "WIRELESS_KEY_1", Ops.get(@wl_key, 1, ""))
+ Ops.set(newdev, "WIRELESS_KEY_2", Ops.get(@wl_key, 2, ""))
+ Ops.set(newdev, "WIRELESS_KEY_3", Ops.get(@wl_key, 3, ""))
+ Ops.set(
+ newdev,
+ "WIRELESS_DEFAULT_KEY",
+ Builtins.tostring(@wl_default_key)
+ )
+ Ops.set(newdev, "WIRELESS_NICK", @wl_nick)
+ Ops.set(newdev, "WIRELESS_AP_SCANMODE", @wl_ap_scanmode)
- when "vlan"
- Ops.set(newdev, "ETHERDEVICE", @vlan_etherdevice)
- Ops.set(newdev, "VLAN_ID", @vlan_id)
-
- when "br"
- Ops.set(newdev, "BRIDGE_PORTS", @bridge_ports)
- Ops.set(newdev, "BRIDGE", "yes")
- Ops.set(newdev, "BRIDGE_STP", "off")
- Ops.set(newdev, "BRIDGE_FORWARDDELAY", "0")
-
- when "wlan"
- Ops.set(newdev, "WIRELESS_MODE", @wl_mode)
- Ops.set(newdev, "WIRELESS_ESSID", @wl_essid)
- Ops.set(newdev, "WIRELESS_NWID", @wl_nwid)
- Ops.set(newdev, "WIRELESS_AUTH_MODE", @wl_auth_mode)
- Ops.set(newdev, "WIRELESS_WPA_PSK", @wl_wpa_psk)
- Ops.set(newdev, "WIRELESS_KEY_LENGTH", @wl_key_length)
- # obsoleted by WIRELESS_KEY_0
- Ops.set(newdev, "WIRELESS_KEY", "") # TODO: delete the varlable
- Ops.set(newdev, "WIRELESS_KEY_0", Ops.get(@wl_key, 0, ""))
- Ops.set(newdev, "WIRELESS_KEY_1", Ops.get(@wl_key, 1, ""))
- Ops.set(newdev, "WIRELESS_KEY_2", Ops.get(@wl_key, 2, ""))
- Ops.set(newdev, "WIRELESS_KEY_3", Ops.get(@wl_key, 3, ""))
+ if @wl_wpa_eap != {}
+ Ops.set(
+ newdev,
+ "WIRELESS_EAP_MODE",
+ Ops.get_string(@wl_wpa_eap, "WPA_EAP_MODE", "")
+ )
+ Ops.set(
+ newdev,
+ "WIRELESS_WPA_IDENTITY",
+ Ops.get_string(@wl_wpa_eap, "WPA_EAP_IDENTITY", "")
+ )
+ Ops.set(
+ newdev,
+ "WIRELESS_WPA_PASSWORD",
+ Ops.get_string(@wl_wpa_eap, "WPA_EAP_PASSWORD", "")
+ )
+ Ops.set(
+ newdev,
+ "WIRELESS_WPA_ANONID",
+ Ops.get_string(@wl_wpa_eap, "WPA_EAP_ANONID", "")
+ )
+ Ops.set(
+ newdev,
+ "WIRELESS_CLIENT_CERT",
+ Ops.get_string(@wl_wpa_eap, "WPA_EAP_CLIENT_CERT", "")
+ )
+ Ops.set(
+ newdev,
+ "WIRELESS_CLIENT_KEY",
+ Ops.get_string(@wl_wpa_eap, "WPA_EAP_CLIENT_KEY", "")
+ )
Ops.set(
newdev,
- "WIRELESS_DEFAULT_KEY",
- Builtins.tostring(@wl_default_key)
+ "WIRELESS_CLIENT_KEY_PASSWORD",
+ Ops.get_string(@wl_wpa_eap, "WPA_EAP_CLIENT_KEY_PASSWORD", "")
)
- Ops.set(newdev, "WIRELESS_NICK", @wl_nick)
- Ops.set(newdev, "WIRELESS_AP_SCANMODE", @wl_ap_scanmode)
+ Ops.set(
+ newdev,
+ "WIRELESS_CA_CERT",
+ Ops.get_string(@wl_wpa_eap, "WPA_EAP_CA_CERT", "")
+ )
+ Ops.set(
+ newdev,
+ "WIRELESS_EAP_AUTH",
+ Ops.get_string(@wl_wpa_eap, "WPA_EAP_AUTH", "")
+ )
+ Ops.set(
+ newdev,
+ "WIRELESS_PEAP_VERSION",
+ Ops.get_string(@wl_wpa_eap, "WPA_EAP_PEAP_VERSION", "")
+ )
+ end
- if @wl_wpa_eap != {}
- Ops.set(
- newdev,
- "WIRELESS_EAP_MODE",
- Ops.get_string(@wl_wpa_eap, "WPA_EAP_MODE", "")
- )
- Ops.set(
- newdev,
- "WIRELESS_WPA_IDENTITY",
- Ops.get_string(@wl_wpa_eap, "WPA_EAP_IDENTITY", "")
- )
- Ops.set(
- newdev,
- "WIRELESS_WPA_PASSWORD",
- Ops.get_string(@wl_wpa_eap, "WPA_EAP_PASSWORD", "")
- )
- Ops.set(
- newdev,
- "WIRELESS_WPA_ANONID",
- Ops.get_string(@wl_wpa_eap, "WPA_EAP_ANONID", "")
- )
- Ops.set(
- newdev,
- "WIRELESS_CLIENT_CERT",
- Ops.get_string(@wl_wpa_eap, "WPA_EAP_CLIENT_CERT", "")
- )
- Ops.set(
- newdev,
- "WIRELESS_CLIENT_KEY",
- Ops.get_string(@wl_wpa_eap, "WPA_EAP_CLIENT_KEY", "")
- )
- Ops.set(
- newdev,
- "WIRELESS_CLIENT_KEY_PASSWORD",
- Ops.get_string(@wl_wpa_eap, "WPA_EAP_CLIENT_KEY_PASSWORD", "")
- )
- Ops.set(
- newdev,
- "WIRELESS_CA_CERT",
- Ops.get_string(@wl_wpa_eap, "WPA_EAP_CA_CERT", "")
- )
- Ops.set(
- newdev,
- "WIRELESS_EAP_AUTH",
- Ops.get_string(@wl_wpa_eap, "WPA_EAP_AUTH", "")
- )
- Ops.set(
- newdev,
- "WIRELESS_PEAP_VERSION",
- Ops.get_string(@wl_wpa_eap, "WPA_EAP_PEAP_VERSION", "")
- )
- end
+ Ops.set(newdev, "WIRELESS_CHANNEL", @wl_channel)
+ Ops.set(newdev, "WIRELESS_FREQUENCY", @wl_frequency)
+ Ops.set(newdev, "WIRELESS_BITRATE", @wl_bitrate)
+ Ops.set(newdev, "WIRELESS_AP", @wl_accesspoint)
+ Ops.set(newdev, "WIRELESS_POWER", @wl_power ? "yes" : "no")
- Ops.set(newdev, "WIRELESS_CHANNEL", @wl_channel)
- Ops.set(newdev, "WIRELESS_FREQUENCY", @wl_frequency)
- Ops.set(newdev, "WIRELESS_BITRATE", @wl_bitrate)
- Ops.set(newdev, "WIRELESS_AP", @wl_accesspoint)
- Ops.set(newdev, "WIRELESS_POWER", @wl_power ? "yes" : "no")
-
- when "ib"
- newdev["IPOIB_MODE"] = @ipoib_mode
+ when "ib"
+ newdev["IPOIB_MODE"] = @ipoib_mode
- end
+ end
- if DriverType(@type) == "ctc"
- if Ops.get(NetworkConfig.Config, "WAIT_FOR_INTERFACES") == nil ||
- Ops.less_than(
- Ops.get_integer(NetworkConfig.Config, "WAIT_FOR_INTERFACES", 0),
- 40
- )
- Ops.set(NetworkConfig.Config, "WAIT_FOR_INTERFACES", 40)
- end
+ if DriverType(@type) == "ctc"
+ if Ops.get(NetworkConfig.Config, "WAIT_FOR_INTERFACES") == nil ||
+ Ops.less_than(
+ Ops.get_integer(NetworkConfig.Config, "WAIT_FOR_INTERFACES", 0),
+ 40
+ )
+ Ops.set(NetworkConfig.Config, "WAIT_FOR_INTERFACES", 40)
end
+ end
- if @alias == ""
- Ops.set(newdev, "_aliases", @aliases)
- Builtins.y2milestone("aliases %1", @aliases)
- end
- if Builtins.contains(["tun", "tap"], @type)
- newdev = {
- "BOOTPROTO" => "static",
- "STARTMODE" => "auto",
- "TUNNEL" => @type,
- "TUNNEL_SET_PERSISTENT" => @tunnel_set_persistent ? "yes" : "no",
- "TUNNEL_SET_OWNER" => @tunnel_set_owner,
- "TUNNEL_SET_GROUP" => @tunnel_set_group
- }
- end
+ if Builtins.contains(["tun", "tap"], @type)
+ newdev = {
+ "BOOTPROTO" => "static",
+ "STARTMODE" => "auto",
+ "TUNNEL" => @type,
+ "TUNNEL_SET_OWNER" => @tunnel_set_owner,
+ "TUNNEL_SET_GROUP" => @tunnel_set_group
+ }
+ end
- # L3: bnc#585458
- # FIXME: INTERFACETYPE confuses sysconfig, bnc#458412
- # Only test when newdev has enough info for GetTypeFromIfcfg to work.
- implied_type = NetworkInterfaces.GetTypeFromIfcfg(newdev)
- if implied_type != nil && implied_type != @type
- Ops.set(newdev, "INTERFACETYPE", @type)
- end
-
- NetworkInterfaces.Name = Ops.get_string(@Items, [@current, "ifcfg"], "")
- NetworkInterfaces.Current = deep_copy(newdev)
-
- # bnc#752464 - can leak wireless passwords
- # useful only for debugging. Writes huge struct mostly filled by defaults.
- Builtins.y2debug("%1", NetworkInterfaces.ConcealSecrets1(newdev))
+ # L3: bnc#585458
+ # FIXME: INTERFACETYPE confuses sysconfig, bnc#458412
+ # Only test when newdev has enough info for GetTypeFromIfcfg to work.
+ implied_type = NetworkInterfaces.GetTypeFromIfcfg(newdev)
+ if implied_type != nil && implied_type != @type
+ Ops.set(newdev, "INTERFACETYPE", @type)
+ end
+
+ NetworkInterfaces.Name = Ops.get_string(@Items, [@current, "ifcfg"], "")
+ NetworkInterfaces.Current = deep_copy(newdev)
+
+ # bnc#752464 - can leak wireless passwords
+ # useful only for debugging. Writes huge struct mostly filled by defaults.
+ Builtins.y2debug("%1", NetworkInterfaces.ConcealSecrets1(newdev))
+
+ Ops.set(@Items, [@current, "ifcfg"], "") if !NetworkInterfaces.Commit
- Ops.set(@Items, [@current, "ifcfg"], "") if !NetworkInterfaces.Commit
- else
- Builtins.y2error("Unknown operation: %1", @operation)
- return false
- end
@modified = true
@operation = nil
true
@@ -2493,6 +2511,7 @@
publish :variable => :ipaddr, :type => "string"
publish :variable => :remoteip, :type => "string"
publish :variable => :netmask, :type => "string"
+ publish :variable => :set_default_route, :type => "boolean"
publish :variable => :prefix, :type => "string"
publish :variable => :startmode, :type => "string"
publish :variable => :ifplugd_priority, :type => "string"
@@ -2534,7 +2553,6 @@
publish :variable => :qeth_chanids, :type => "string"
publish :variable => :lcs_timeout, :type => "string"
publish :variable => :aliases, :type => "map"
- publish :variable => :tunnel_set_persistent, :type => "boolean"
publish :variable => :tunnel_set_owner, :type => "string"
publish :variable => :tunnel_set_group, :type => "string"
publish :variable => :proposal_valid, :type => "boolean"
continue with "q"...
Checked in at Wed Apr 9 17:12:06 CEST 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
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-iscsi-client -> sle12
## BNC# 872049 : "Internel error for creating autoinst.xml" (RESOLVED/FIXED)
## BNC# 868220 : "yast2 refuses to use a non-standard iqn" (RESOLVED/FIXED)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-iscsi-client/yast2-iscsi-client.changes 2014-03-17 12:25:55.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-iscsi-client/yast2-iscsi-client.changes 2014-04-09 12:02:21.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Apr 8 14:37:23 CEST 2014 - gs(a)suse.de
+
+- don't throw exception if socket not found (bnc #872049)
+- add Requires: open-iscsi to spec-file
+- 3.1.5
+
+-------------------------------------------------------------------
+Tue Apr 1 11:25:37 CEST 2014 - gs(a)suse.de
+
+- allow non-standard iqn (bnc #868220)
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-iscsi-client
- yast2-schema
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-iscsi-client (Old)
and /mounts/work_src_done/SLE12/yast2-iscsi-client (BS:build ID:35722 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-iscsi-client", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-iscsi-client-3.1.4.tar.bz2
New:
----
yast2-iscsi-client-3.1.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.GdB7TM/_old 2014-04-09 17:07:32.000000000 +0200
+++ /var/tmp/diff_new_pack.GdB7TM/_new 2014-04-09 17:07:32.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-iscsi-client
-Version: 3.1.4
+Version: 3.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -41,6 +41,7 @@
BuildArchitectures: noarch
Requires: yast2-ruby-bindings >= 3.1.7
+Requires: open-iscsi
Summary: YaST2 - iSCSI Client Configuration
++++++ yast2-iscsi-client-3.1.4.tar.bz2 -> yast2-iscsi-client-3.1.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.4/package/yast2-iscsi-client.changes new/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.changes
--- old/yast2-iscsi-client-3.1.4/package/yast2-iscsi-client.changes 2014-03-17 09:34:16.000000000 +0100
+++ new/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.changes 2014-04-09 11:58:12.000000000 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Tue Apr 8 14:37:23 CEST 2014 - gs(a)suse.de
+
+- don't throw exception if socket not found (bnc #872049)
+- add Requires: open-iscsi to spec-file
+- 3.1.5
+
+-------------------------------------------------------------------
+Tue Apr 1 11:25:37 CEST 2014 - gs(a)suse.de
+
+- allow non-standard iqn (bnc #868220)
+
+-------------------------------------------------------------------
Fri Mar 14 10:47:43 CET 2014 - gs(a)suse.de
- start iscsid socket and iscsi service correctly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.4/package/yast2-iscsi-client.spec new/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.spec
--- old/yast2-iscsi-client-3.1.4/package/yast2-iscsi-client.spec 2014-03-17 09:34:16.000000000 +0100
+++ new/yast2-iscsi-client-3.1.5/package/yast2-iscsi-client.spec 2014-04-09 11:58:12.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-iscsi-client
-Version: 3.1.4
+Version: 3.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -41,6 +41,7 @@
BuildArchitectures: noarch
Requires: yast2-ruby-bindings >= 3.1.7
+Requires: open-iscsi
Summary: YaST2 - iSCSI Client Configuration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.4/src/include/iscsi-client/widgets.rb new/yast2-iscsi-client-3.1.5/src/include/iscsi-client/widgets.rb
--- old/yast2-iscsi-client-3.1.4/src/include/iscsi-client/widgets.rb 2014-03-17 09:34:16.000000000 +0100
+++ new/yast2-iscsi-client-3.1.5/src/include/iscsi-client/widgets.rb 2014-04-09 11:58:12.000000000 +0200
@@ -419,7 +419,7 @@
Builtins.regexpmatch(i_name, Builtins.sformat("^eui.%1%2$", reg1, reg2))
if !correct
- Popup.Warning(
+ continue = Popup.ContinueCancel(
_(
"Incorrect InitiatorName.\n" +
"The correct syntax is\n" +
@@ -430,9 +430,10 @@
"iqn.2007-04.cz.server:storage.disk.sdb\n"
)
)
+ return continue
+ else
+ return true
end
-
- correct
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.4/src/modules/IscsiClientLib.rb new/yast2-iscsi-client-3.1.5/src/modules/IscsiClientLib.rb
--- old/yast2-iscsi-client-3.1.4/src/modules/IscsiClientLib.rb 2014-03-17 09:34:16.000000000 +0100
+++ new/yast2-iscsi-client-3.1.5/src/modules/IscsiClientLib.rb 2014-04-09 11:58:12.000000000 +0200
@@ -568,7 +568,7 @@
Builtins.y2milestone("Initiatorname %1 written", @initiatorname)
end
# reload service when initiatorname is changed to re-read new value (bnc#482429)
- # restart the daemon (reload not supported with systemd)
+ # SLES12: restart the daemon (reload not supported in iscsid.service)
Service.Restart("iscsid")
ret
end
@@ -999,8 +999,7 @@
startIScsid
else
# find socket (only in installed system)
- # raise exception if socket isn't available
- @iscsid_socket = SystemdSocket.find!("iscsid")
+ @iscsid_socket = SystemdSocket.find("iscsid")
@serviceStatus = true if Service.Status("iscsi") == 0
@socketStatus = true if iscsidSocketActive?
continue with "q"...
Checked in at Wed Apr 9 17:08:38 CEST 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] Request 35722 changed to accepted (submit SUSE:SLE-12:GA/yast2-iscsi-client)
by Ruediger Oertel 09 Apr '14
by Ruediger Oertel 09 Apr '14
09 Apr '14
Visit https://build.suse.de/request/show/35722
State of request 35722 was changed by oertel:
new -> accepted
Comment:
Accepted submit request 35722 from user leonardocf
Actions:
- submit Devel:YaST:Head/yast2-iscsi-client => SUSE:SLE-12:GA/yast2-iscsi-client
--
Configure notifications at https://build.suse.de/user/notifications
SUSE Internal OBS Instance (https://build.suse.de/)
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] Request 35688 changed to accepted (submit SUSE:SLE-12:GA/yast2-installation)
by Ruediger Oertel 09 Apr '14
by Ruediger Oertel 09 Apr '14
09 Apr '14
Visit https://build.suse.de/request/show/35688
State of request 35688 was changed by oertel:
new -> accepted
Comment:
Accepted submit request 35688 from user leonardocf
Actions:
- submit Devel:YaST:Head/yast2-installation => SUSE:SLE-12:GA/yast2-installation
--
Configure notifications at https://build.suse.de/user/notifications
SUSE Internal OBS Instance (https://build.suse.de/)
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
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-installation -> sle12
## BNC# 869172 : "libGL error (via ssh): failed to load driver: <native GL hardware driver>" (NEW/)
## BNC# 871178 : "No network during upgrade" (RESOLVED/FIXED)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes 2014-04-02 16:09:15.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes 2014-04-09 10:23:01.000000000 +0200
@@ -1,0 +2,19 @@
+Wed Apr 9 10:07:02 CEST 2014 - snwint(a)suse.de
+
+- save a copy of pbl.log
+- 3.1.64
+
+-------------------------------------------------------------------
+Fri Apr 4 15:33:40 CEST 2014 - snwint(a)suse.de
+
+- remove LIBGL_ALWAYS_INDIRECT (bnc #869172)
+- 3.1.63
+
+-------------------------------------------------------------------
+Thu Apr 3 12:15:49 UTC 2014 - jreidinger(a)suse.com
+
+- do not write network configuration from upgrade to system
+ (bnc#871178)
+- 3.1.62
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-installation
- at least 20 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-installation (Old)
and /mounts/work_src_done/SLE12/yast2-installation (BS:build ID:35688 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-installation-3.1.61.tar.bz2
New:
----
yast2-installation-3.1.64.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.hHRfQB/_old 2014-04-09 17:06:12.000000000 +0200
+++ /var/tmp/diff_new_pack.hHRfQB/_new 2014-04-09 17:06:12.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.61
+Version: 3.1.64
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-3.1.61.tar.bz2 -> yast2-installation-3.1.64.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.61/package/yast2-installation.changes new/yast2-installation-3.1.64/package/yast2-installation.changes
--- old/yast2-installation-3.1.61/package/yast2-installation.changes 2014-04-02 15:48:21.000000000 +0200
+++ new/yast2-installation-3.1.64/package/yast2-installation.changes 2014-04-09 10:18:26.000000000 +0200
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+Wed Apr 9 10:07:02 CEST 2014 - snwint(a)suse.de
+
+- save a copy of pbl.log
+- 3.1.64
+
+-------------------------------------------------------------------
+Fri Apr 4 15:33:40 CEST 2014 - snwint(a)suse.de
+
+- remove LIBGL_ALWAYS_INDIRECT (bnc #869172)
+- 3.1.63
+
+-------------------------------------------------------------------
+Thu Apr 3 12:15:49 UTC 2014 - jreidinger(a)suse.com
+
+- do not write network configuration from upgrade to system
+ (bnc#871178)
+- 3.1.62
+
+-------------------------------------------------------------------
Wed Apr 2 09:25:38 UTC 2014 - jreidinger(a)suse.com
- remove ssh_service_finish as it is handle in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.61/package/yast2-installation.spec new/yast2-installation-3.1.64/package/yast2-installation.spec
--- old/yast2-installation-3.1.61/package/yast2-installation.spec 2014-04-02 15:48:21.000000000 +0200
+++ new/yast2-installation-3.1.64/package/yast2-installation.spec 2014-04-09 10:18:26.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.61
+Version: 3.1.64
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.61/src/clients/copy_logs_finish.rb new/yast2-installation-3.1.64/src/clients/copy_logs_finish.rb
--- old/yast2-installation-3.1.61/src/clients/copy_logs_finish.rb 2014-04-02 15:48:21.000000000 +0200
+++ new/yast2-installation-3.1.64/src/clients/copy_logs_finish.rb 2014-04-09 10:18:26.000000000 +0200
@@ -118,6 +118,11 @@
InjectFile(Ops.add(Ops.add(Directory.logdir, "/"), file))
end
end
+
+ WFM.Execute(
+ path(".local.bash"),
+ "/bin/cp /var/log/pbl.log '#{Installation.destdir}/#{Directory.logdir}/pbl-instsys.log'"
+ )
else
Builtins.y2error("unknown function: %1", @func)
@ret = nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.61/src/clients/network_finish.rb new/yast2-installation-3.1.64/src/clients/network_finish.rb
--- old/yast2-installation-3.1.61/src/clients/network_finish.rb 2014-04-02 15:48:21.000000000 +0200
+++ new/yast2-installation-3.1.64/src/clients/network_finish.rb 2014-04-09 10:18:26.000000000 +0200
@@ -67,7 +67,7 @@
"steps" => 1,
# progress step title
"title" => _("Saving network configuration..."),
- "when" => [:installation, :update, :autoinst]
+ "when" => [:installation, :autoinst]
}
elsif @func == "Write"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.61/src/modules/ImageInstallation.rb new/yast2-installation-3.1.64/src/modules/ImageInstallation.rb
--- old/yast2-installation-3.1.61/src/modules/ImageInstallation.rb 2014-04-02 15:48:21.000000000 +0200
+++ new/yast2-installation-3.1.64/src/modules/ImageInstallation.rb 2014-04-09 10:18:27.000000000 +0200
@@ -36,6 +36,8 @@
module Yast
class ImageInstallationClass < Module
+ include Yast::Logger
+
def main
Yast.import "UI"
Yast.import "Pkg"
@@ -139,6 +141,9 @@
"steps_reserved" => 10
}
}
+
+ # Images selected by FindImageSet()
+ @selected_images = {}
end
# Set the repository to get images from
@@ -886,7 +891,7 @@
# trying to find all matching patterns
Builtins.foreach(image_sets) do |image|
- pattern = Ops.get_string(image, "patterns", "")
+ pattern = image["patterns"]
imageset_patterns = Builtins.splitstring(pattern, ", ")
Ops.set(
patterns_in_imagesets,
@@ -917,11 +922,7 @@
end
end
- Builtins.y2debug(
- "Matching patterns: %1, sizes: %2",
- possible_patterns,
- matching_patterns
- )
+ log.info "Matching patterns: #{possible_patterns}, sizes: #{matching_patterns}"
# selecting the best imageset
last_pattern = ""
@@ -957,6 +958,7 @@
end
Builtins.y2milestone("Result: %1/%2", last_pattern, result)
+ @selected_images = result
# No matching pattern
if result == {}
@@ -1486,10 +1488,16 @@
@_image_order = []
@images_details = {}
@_mounted_images = []
+ @selected_images = {}
nil
end
+ # Only for checking in tests now
+ def selected_images
+ @selected_images
+ end
+
publish :function => :SetRepo, :type => "void (integer)"
publish :variable => :last_patterns_selected, :type => "list <string>"
publish :variable => :changed_by_user, :type => "boolean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.61/startup/YaST2.call new/yast2-installation-3.1.64/startup/YaST2.call
--- old/yast2-installation-3.1.61/startup/YaST2.call 2014-04-02 15:48:21.000000000 +0200
+++ new/yast2-installation-3.1.64/startup/YaST2.call 2014-04-09 10:18:27.000000000 +0200
@@ -139,7 +139,6 @@
#
:
export Y2STYLE="installation_slim"
- export LIBGL_ALWAYS_INDIRECT=1
set_inst_qt_env
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.61/test/data/images/images.xml new/yast2-installation-3.1.64/test/data/images/images.xml
--- old/yast2-installation-3.1.61/test/data/images/images.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.64/test/data/images/images.xml 2014-04-09 10:18:27.000000000 +0200
@@ -0,0 +1,346 @@
+<?xml version="1.0"?>
+<!DOCTYPE images>
+<image_installation xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
+<image_sets config:type="list" >
+ <!-- Example taken from openSUSE 13.1 GM -->
+ <image_set>
+ <patterns>base,enhanced_base,games,imaging,kde4,kde4_basis,multimedia,sw_management,x11</patterns>
+ <archs>i386</archs>
+ <pkg_image>kde-meta-i386.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [desktop]</name>
+ <type>tar</type>
+ <file>common-desktop-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE</name>
+ <type>tar</type>
+ <file>kde-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta-i386.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,fonts,games,gnome,gnome_basis,imaging,multimedia,sw_management,x11</patterns>
+ <archs>i386</archs>
+ <pkg_image>gnome-meta-i386.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>GNOME [1]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [2]</name>
+ <type>tar</type>
+ <file>common-xorg-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [4]</name>
+ <type>tar</type>
+ <file>common-desktop-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME</name>
+ <type>tar</type>
+ <file>gnome-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [meta]</name>
+ <type>tar</type>
+ <file>gnome-meta-i386.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,sw_management</patterns>
+ <archs>i386</archs>
+ <pkg_image>base-meta-i386.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>BASE [1]</name>
+ <type>tar</type>
+ <file>base-meta-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>BASE [2]</name>
+ <type>tar</type>
+ <file>base-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>BASE [3]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,fonts,sw_management,x11</patterns>
+ <archs>i386</archs>
+ <pkg_image>x11-meta-i386.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>X11 [1]</name>
+ <type>tar</type>
+ <file>x11-meta-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [2]</name>
+ <type>tar</type>
+ <file>x11-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [3]</name>
+ <type>tar</type>
+ <file>common-xorg-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [4]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,games,imaging,kde4,kde4_basis,multimedia,sw_management,x11</patterns>
+ <archs>x86_64</archs>
+ <pkg_image>kde-meta-x86_64.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [desktop]</name>
+ <type>tar</type>
+ <file>common-desktop-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE</name>
+ <type>tar</type>
+ <file>kde-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta-x86_64.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,fonts,games,gnome,gnome_basis,imaging,multimedia,sw_management,x11</patterns>
+ <archs>x86_64</archs>
+ <pkg_image>gnome-meta-x86_64.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>GNOME [1]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [2]</name>
+ <type>tar</type>
+ <file>common-xorg-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [4]</name>
+ <type>tar</type>
+ <file>common-desktop-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME</name>
+ <type>tar</type>
+ <file>gnome-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [meta]</name>
+ <type>tar</type>
+ <file>gnome-meta-x86_64.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,sw_management</patterns>
+ <archs>x86_64</archs>
+ <pkg_image>base-meta-x86_64.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>BASE [1]</name>
+ <type>tar</type>
+ <file>base-meta-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>BASE [2]</name>
+ <type>tar</type>
+ <file>base-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>BASE [3]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,fonts,sw_management,x11</patterns>
+ <archs>x86_64</archs>
+ <pkg_image>x11-meta-x86_64.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>X11 [1]</name>
+ <type>tar</type>
+ <file>x11-meta-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [2]</name>
+ <type>tar</type>
+ <file>x11-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [3]</name>
+ <type>tar</type>
+ <file>common-xorg-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [4]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,games,imaging,kde4,kde4_basis,multimedia,sw_management,x11</patterns>
+ <archs>ppc</archs>
+ <pkg_image>kde-meta-ppc.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [desktop]</name>
+ <type>tar</type>
+ <file>common-desktop-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE</name>
+ <type>tar</type>
+ <file>kde-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta-ppc.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,fonts,games,gnome,gnome_basis,imaging,multimedia,sw_management,x11</patterns>
+ <archs>ppc</archs>
+ <pkg_image>gnome-meta-ppc.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>GNOME [1]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [2]</name>
+ <type>tar</type>
+ <file>common-xorg-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [4]</name>
+ <type>tar</type>
+ <file>common-desktop-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME</name>
+ <type>tar</type>
+ <file>gnome-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [meta]</name>
+ <type>tar</type>
+ <file>gnome-meta-ppc.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,sw_management</patterns>
+ <archs>ppc</archs>
+ <pkg_image>base-meta-ppc.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>BASE [1]</name>
+ <type>tar</type>
+ <file>base-meta-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>BASE [2]</name>
+ <type>tar</type>
+ <file>base-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>BASE [3]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,fonts,sw_management,x11</patterns>
+ <archs>ppc</archs>
+ <pkg_image>x11-meta-ppc.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>X11 [1]</name>
+ <type>tar</type>
+ <file>x11-meta-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [2]</name>
+ <type>tar</type>
+ <file>x11-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [3]</name>
+ <type>tar</type>
+ <file>common-xorg-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [4]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+</image_sets>
+</image_installation>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.61/test/image_installation_test.rb new/yast2-installation-3.1.64/test/image_installation_test.rb
--- old/yast2-installation-3.1.61/test/image_installation_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.64/test/image_installation_test.rb 2014-04-09 10:18:27.000000000 +0200
@@ -0,0 +1,71 @@
+#! /usr/bin/env rspec
+
+require_relative "./test_helper"
+
+Yast.import "ImageInstallation"
+Yast.import "Installation"
+
+# For mocking
+Yast.import "Pkg"
+Yast.import "Arch"
+
+IMAGES_DESCR_FILE = File.join(File.expand_path(File.dirname(__FILE__)), "data/images/images.xml")
+
+KDE4_PATTERNS = ["base","enhanced_base","games","imaging","kde4","kde4_basis","multimedia","sw_management","x11"]
+GNOME_PATTERNS = ["base","enhanced_base","fonts","games","gnome","gnome_basis","imaging","multimedia","sw_management","x11"]
+X11_PATTERNS = ["base","enhanced_base","fonts","sw_management","x11"]
+BASE_PATTERNS = ["base","enhanced_base","sw_management"]
+
+NON_MATCHING_PATTERNS_1 = ["games", "gnome_basis"]
+NON_MATCHING_PATTERNS_2 = ["enhanced_base"]
+
+NON_MATCHING_ARCH = "unsupported"
+
+ARCHS = ["i386", "x86_64", "ppc"]
+
+describe Yast::ImageInstallation do
+ describe "#FindImageSet" do
+ before(:each) do
+ Yast::Pkg.stub(:SourceProvideDigestedFile).and_return(IMAGES_DESCR_FILE)
+ end
+
+ it "finds images matching architecture and selected patterns and returns if processing was successful" do
+ ARCHS.each do |arch|
+ Yast::Arch.stub(:arch_short).and_return(arch)
+
+ [KDE4_PATTERNS, GNOME_PATTERNS, X11_PATTERNS, BASE_PATTERNS].each do |patterns|
+ Yast::ImageInstallation.FreeInternalVariables()
+ expect(Yast::ImageInstallation.FindImageSet(patterns)).to be_true
+ expect(Yast::Installation.image_installation).to be_true
+ expect(Yast::ImageInstallation.selected_images["archs"]).to eq(arch)
+ end
+ end
+ end
+
+ it "does not find any image using unsupported architecture and returns if processing was successful" do
+ [KDE4_PATTERNS, GNOME_PATTERNS, X11_PATTERNS, BASE_PATTERNS].each do |patterns|
+ Yast::Arch.stub(:arch_short).and_return(NON_MATCHING_ARCH)
+ Yast::ImageInstallation.FreeInternalVariables()
+
+ expect(Yast::ImageInstallation.FindImageSet(patterns)).to be_true
+ expect(Yast::Installation.image_installation).to be_false
+ expect(Yast::ImageInstallation.selected_images).to be_empty
+ end
+ end
+
+ it "does not find any image using unsupported patterns and returns if processing was successful" do
+ ARCHS.each do |arch|
+ Yast::Arch.stub(:arch_short).and_return(arch)
+
+ [NON_MATCHING_PATTERNS_2, NON_MATCHING_PATTERNS_2].each do |patterns|
+ Yast::ImageInstallation.FreeInternalVariables()
+
+ expect(Yast::ImageInstallation.FindImageSet(patterns)).to be_true
+ expect(Yast::Installation.image_installation).to be_false
+ expect(Yast::ImageInstallation.selected_images).to be_empty
+ end
+ end
+ end
+
+ end
+end
continue with "q"...
Checked in at Wed Apr 9 17:07:22 CEST 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
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-control-center -> sle12
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-control-center/yast2-control-center.changes 2014-02-28 11:22:58.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-control-center/yast2-control-center.changes 2014-04-04 16:54:40.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Apr 4 14:44:54 UTC 2014 - mvidner(a)suse.com
+
+- CMakeFile: QT5_USE_MODULES is deprecated in Qt5.3 (H Senjan)
+- Use pkgconfig BuildRequires to reduce build deps.
+- 3.1.3
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-control-center
- yast2-schema
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-control-center (Old)
and /mounts/work_src_done/SLE12/yast2-control-center (BS:build ID:35553 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-control-center", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-control-center-3.1.2.tar.bz2
New:
----
yast2-control-center-3.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.BTFgCj/_old 2014-04-09 17:05:51.000000000 +0200
+++ /var/tmp/diff_new_pack.BTFgCj/_new 2014-04-09 17:05:51.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-control-center
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# 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-control-center
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -25,10 +25,12 @@
BuildRequires: cmake
BuildRequires: libdrm-devel
BuildRequires: libjpeg-devel
-BuildRequires: libqt5-qtbase-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Widgets)
Requires: yast2_theme
@@ -39,6 +41,7 @@
BuildRequires: gcc-c++ >= 4.6
%endif
+Url: https://github.com/yast/yast-control-center
Summary: YaST2 - Control Center
License: GPL-2.0
Group: System/YaST
++++++ yast2-control-center-3.1.2.tar.bz2 -> yast2-control-center-3.1.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-3.1.2/CMakeLists.txt new/yast2-control-center-3.1.3/CMakeLists.txt
--- old/yast2-control-center-3.1.2/CMakeLists.txt 2014-02-27 16:14:52.000000000 +0100
+++ new/yast2-control-center-3.1.3/CMakeLists.txt 2014-04-04 16:48:10.000000000 +0200
@@ -1,6 +1,6 @@
PROJECT( yast2-control-center )
CMAKE_MINIMUM_REQUIRED( VERSION 2.8.9 )
-FIND_PACKAGE( Qt5Core REQUIRED )
+FIND_PACKAGE(Qt5 CONFIG REQUIRED Core Widgets Gui)
SET( RPMNAME "yast2-control-center" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-3.1.2/package/yast2-control-center.changes new/yast2-control-center-3.1.3/package/yast2-control-center.changes
--- old/yast2-control-center-3.1.2/package/yast2-control-center.changes 2014-02-27 16:14:52.000000000 +0100
+++ new/yast2-control-center-3.1.3/package/yast2-control-center.changes 2014-04-04 16:48:10.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Apr 4 14:44:54 UTC 2014 - mvidner(a)suse.com
+
+- CMakeFile: QT5_USE_MODULES is deprecated in Qt5.3 (H Senjan)
+- Use pkgconfig BuildRequires to reduce build deps.
+- 3.1.3
+
+-------------------------------------------------------------------
Thu Feb 27 14:50:21 UTC 2014 - mvidner(a)suse.com
- Fixed save_y2logs invocation (bnc#866056).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-3.1.2/package/yast2-control-center.spec new/yast2-control-center-3.1.3/package/yast2-control-center.spec
--- old/yast2-control-center-3.1.2/package/yast2-control-center.spec 2014-02-27 16:14:52.000000000 +0100
+++ new/yast2-control-center-3.1.3/package/yast2-control-center.spec 2014-04-04 16:48:10.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-control-center
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# 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-control-center
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -25,10 +25,12 @@
BuildRequires: cmake
BuildRequires: libdrm-devel
BuildRequires: libjpeg-devel
-BuildRequires: libqt5-qtbase-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Widgets)
Requires: yast2_theme
@@ -39,6 +41,7 @@
BuildRequires: gcc-c++ >= 4.6
%endif
+Url: https://github.com/yast/yast-control-center
Summary: YaST2 - Control Center
License: GPL-2.0
Group: System/YaST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-3.1.2/src/CMakeLists.txt new/yast2-control-center-3.1.3/src/CMakeLists.txt
--- old/yast2-control-center-3.1.2/src/CMakeLists.txt 2014-02-27 16:14:52.000000000 +0100
+++ new/yast2-control-center-3.1.3/src/CMakeLists.txt 2014-04-04 16:48:10.000000000 +0200
@@ -54,8 +54,7 @@
SET(CMAKE_AUTOMOC ON)
ADD_EXECUTABLE(y2controlcenter ${yast2-control-center_SRCS} ${yast2-control-center_MOC} ${yast2-control-center_RCC_SRCS})
-QT5_USE_MODULES(y2controlcenter Widgets Gui)
-TARGET_LINK_LIBRARIES(y2controlcenter ${QT_LIBRARIES})
+TARGET_LINK_LIBRARIES(y2controlcenter Qt5::Widgets Qt5::Gui)
INSTALL(TARGETS y2controlcenter DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/YaST2/bin)
INSTALL(FILES yast.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps )
@@ -71,8 +70,7 @@
ADD_EXECUTABLE(models_test ${MODELS_TEST_SRCS})
-QT5_USE_MODULES(models_test Widgets Gui)
-TARGET_LINK_LIBRARIES(models_test ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES})
+TARGET_LINK_LIBRARIES(models_test Qt5::Core Qt5::Widgets Qt5::Gui)
FIND_PACKAGE(KDE4)
IF ( KDE4_FOUND )
continue with "q"...
Checked in at Wed Apr 9 17:06:02 CEST 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] Request 35553 changed to accepted (submit SUSE:SLE-12:GA/yast2-control-center)
by Ruediger Oertel 09 Apr '14
by Ruediger Oertel 09 Apr '14
09 Apr '14
Visit https://build.suse.de/request/show/35553
State of request 35553 was changed by oertel:
new -> accepted
Comment:
Accepted submit request 35553 from user leonardocf
Actions:
- submit Devel:YaST:Head/yast2-control-center => SUSE:SLE-12:GA/yast2-control-center
--
Configure notifications at https://build.suse.de/user/notifications
SUSE Internal OBS Instance (https://build.suse.de/)
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] Request 35685 changed to accepted (submit SUSE:SLE-12:GA/yast2-bootloader)
by Ruediger Oertel 09 Apr '14
by Ruediger Oertel 09 Apr '14
09 Apr '14
Visit https://build.suse.de/request/show/35685
State of request 35685 was changed by oertel:
new -> accepted
Comment:
Accepted submit request 35685 from user leonardocf
Actions:
- submit Devel:YaST:Head/yast2-bootloader => SUSE:SLE-12:GA/yast2-bootloader
--
Configure notifications at https://build.suse.de/user/notifications
SUSE Internal OBS Instance (https://build.suse.de/)
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
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-bootloader -> sle12
## BNC# 872081 : "Add bootloader proposal to the upgrade summary" (ASSIGNED/)
## BNC# 872300 : "Bootloader installation details missing" (RESOLVED/FIXED)
## BNC# 808852 : "mokutil not installed in secure boot mode" (RESOLVED/FIXED)
## BNC# 743805 : "Grub tries to boot old kernel after unattended upgrade from SLES10 SP4 to SLES11 SP1" (RESOLVED/FIXED)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-bootloader/yast2-bootloader.changes 2014-04-02 16:09:01.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-bootloader/yast2-bootloader.changes 2014-04-09 08:52:48.000000000 +0200
@@ -1,0 +2,21 @@
+Tue Apr 8 11:27:42 UTC 2014 - jreidinger(a)suse.com
+
+- modify proposal to work also during upgrade and propose upgrade
+ to grub2 (bnc#872081)
+- 3.1.20
+
+-------------------------------------------------------------------
+Mon Apr 7 14:57:38 UTC 2014 - jreidinger(a)suse.com
+
+- return back installation details for tweaking device map
+ (bnc#872300)
+- 3.1.19
+
+-------------------------------------------------------------------
+Fri Apr 4 13:05:55 CEST 2014 - snwint(a)suse.de
+
+- install mokutil along with shim (bnc #808852)
+- fix regular expessions (ported from bnc #743805)
+- 3.1.18
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-bootloader
- yast2-kdump
- yast2-product-creator
- yast2-reipl
- yast2-schema
- yast2-vm
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-bootloader (Old)
and /mounts/work_src_done/SLE12/yast2-bootloader (BS:build ID:35685 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-bootloader-3.1.17.tar.bz2
New:
----
yast2-bootloader-3.1.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.ERJ1UW/_old 2014-04-09 17:05:31.000000000 +0200
+++ /var/tmp/diff_new_pack.ERJ1UW/_new 2014-04-09 17:05:31.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.17
+Version: 3.1.20
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -101,12 +101,9 @@
%{yast_moduledir}/*
%dir %{yast_clientdir}
%{yast_clientdir}/bootloader*.rb
-%{yast_clientdir}/print-product.rb
%{yast_clientdir}/inst_*.rb
%dir %{yast_ybindir}
%{yast_ybindir}/*
-%dir %{yast_agentdir}
-%{yast_agentdir}/ag_*
%dir %{yast_scrconfdir}
%{yast_scrconfdir}/*.scr
%dir %{yast_fillupdir}
++++++ yast2-bootloader-3.1.17.tar.bz2 -> yast2-bootloader-3.1.20.tar.bz2 ++++++
++++ 2036 lines of diff (skipped)
continue with "q"...
Checked in at Wed Apr 9 17:05:46 CEST 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
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 -> sle12
## BNC# 871158 : "Release notes pauses installing packages" (ASSIGNED/)
## BNC# 872486 : "save_y2logs does not include pbl.log" (RESOLVED/FIXED)
## BNC# 871261 : "Predefined system attribute "installed_product_version" has value "nil' in SLES12 beta3" (RESOLVED/FIXED)
## BNC# 871783 : "uninitialized constant Yast2::HwDetection::SCR" (RESOLVED/FIXED)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes 2014-04-02 12:24:52.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2/yast2.changes 2014-04-09 12:08:41.000000000 +0200
@@ -1,0 +2,27 @@
+Wed Apr 9 07:09:37 UTC 2014 - jsrain(a)suse.cz
+
+- added tabs for release notes into slide show dialog (bnc#871158)
+- 3.1.41
+
+-------------------------------------------------------------------
+Wed Apr 9 06:35:54 UTC 2014 - jreidinger(a)suse.com
+
+- save_y2logs: save also log from perl-Bootloader (bnc#872486)
+- 3.1.40
+
+-------------------------------------------------------------------
+Tue Apr 8 15:01:00 CEST 2014 - locilka(a)suse.com
+
+- Changed way of reading the product information: Reads it from
+ /content file if it exists, then from /etc/os-release, then it
+ throws exception if there is no other place to read (bnc#871261)
+- 3.1.39
+
+-------------------------------------------------------------------
+Tue Apr 8 11:40:15 UTC 2014 - lslezak(a)suse.cz
+
+- fixed "uninitialized constant Yast2::HwDetection::SCR" error
+ (bnc#871783), fixed testsuite
+- 3.1.38
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2
- at least 73 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2 (Old)
and /mounts/work_src_done/SLE12/yast2 (BS:build ID:35724 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-3.1.37.tar.bz2
New:
----
yast2-3.1.41.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.rax1qG/_old 2014-04-09 17:03:37.000000000 +0200
+++ /var/tmp/diff_new_pack.rax1qG/_new 2014-04-09 17:03:37.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2
-Version: 3.1.37
+Version: 3.1.41
Release: 0
URL: https://github.com/yast/yast-yast2
++++++ yast2-3.1.37.tar.bz2 -> yast2-3.1.41.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/library/general/src/modules/OSRelease.rb new/yast2-3.1.41/library/general/src/modules/OSRelease.rb
--- old/yast2-3.1.37/library/general/src/modules/OSRelease.rb 2014-04-02 11:23:23.000000000 +0200
+++ new/yast2-3.1.41/library/general/src/modules/OSRelease.rb 2014-04-09 12:00:12.000000000 +0200
@@ -41,9 +41,7 @@
class OSReleaseClass < Module
include Yast::Logger
- def initialize
- @file_path = "/etc/os-release"
- end
+ OS_RELEASE_PATH = "/etc/os-release"
# Get information about the OS release
# Throws exception Yast::OSReleaseFileMissingError if release file
@@ -52,9 +50,9 @@
# @param [String] directory containing the installed system (/ in installed system)
# @return [String] the release information
def ReleaseInformation(directory)
- release_file = File.join(directory, @file_path)
+ release_file = File.join(directory, OS_RELEASE_PATH)
- if !FileUtils.Exists(release_file)
+ if !os_release_exists?(directory)
log.info "Release file #{release_file} not found"
raise(
OSReleaseFileMissingError,
@@ -73,7 +71,7 @@
return SCR.Read(path(".content.PRODUCT"))
end
directory = "/" # TODO make this optional argument
- Misc.CustomSysconfigRead("NAME", "SUSE LINUX", directory + @file_path)
+ Misc.CustomSysconfigRead("NAME", "SUSE LINUX", directory + OS_RELEASE_PATH)
end
# Get information about the OS version
@@ -84,9 +82,18 @@
return SCR.Read(path(".content.VERSION"))
end
directory = "/"
- Misc.CustomSysconfigRead("VERSION_ID", "", directory + @file_path)
+ Misc.CustomSysconfigRead("VERSION_ID", "", directory + OS_RELEASE_PATH)
end
+ # Returns whether os-release file exists in the given directory
+ #
+ # @param [String] (optional) directory, defaults to "/"
+ # @return [Boolean] whether exists
+ def os_release_exists?(directory = "/")
+ FileUtils.Exists(
+ File.join(directory, OS_RELEASE_PATH)
+ )
+ end
publish :function => :ReleaseInformation, :type => "string (string)"
publish :function => :ReleaseName, :type => "string ()"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/library/packages/Makefile.am new/yast2-3.1.41/library/packages/Makefile.am
--- old/yast2-3.1.37/library/packages/Makefile.am 2014-04-02 11:23:23.000000000 +0200
+++ new/yast2-3.1.41/library/packages/Makefile.am 2014-04-09 12:00:12.000000000 +0200
@@ -1,3 +1,3 @@
# Makefile.am for yast2/library/packages
-SUBDIRS = src testsuite doc
+SUBDIRS = src testsuite doc test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/library/packages/src/modules/Product.rb new/yast2-3.1.41/library/packages/src/modules/Product.rb
--- old/yast2-3.1.37/library/packages/src/modules/Product.rb 2014-04-02 11:23:23.000000000 +0200
+++ new/yast2-3.1.41/library/packages/src/modules/Product.rb 2014-04-09 12:00:12.000000000 +0200
@@ -32,6 +32,9 @@
module Yast
class ProductClass < Module
+
+ CONTENT_FILE = "/content"
+
def main
Yast.import "Pkg"
@@ -40,6 +43,7 @@
Yast.import "OSRelease"
Yast.import "PackageLock"
Yast.import "PackageSystem"
+ Yast.import "FileUtils"
# General product name and version
@name = "" # "SuSE Linux 8.1"
@@ -157,38 +161,39 @@
nil
end
+ def use_content_file?
+ FileUtils.Exists(CONTENT_FILE) && !Mode.live_installation
+ end
+
+ def use_os_release_file?
+ OSRelease.os_release_exists?
+ end
# -----------------------------------------------
# Constructor
def Product
- if Stage.initial && !Mode.live_installation
+ if use_content_file?
# it should use the same mechanism as running system. But it would
# mean to initialize package manager from constructor, which is
# not reasonable
- @name = Convert.to_string(SCR.Read(path(".content.LABEL")))
- @short_name = Convert.to_string(SCR.Read(path(".content.SHORTLABEL")))
- @short_name = @name if @short_name == nil
- @version = Convert.to_string(SCR.Read(path(".content.VERSION")))
- @vendor = Convert.to_string(SCR.Read(path(".content.VENDOR")))
+ @name = SCR.Read(path(".content.LABEL"))
+ @short_name = SCR.Read(path(".content.SHORTLABEL"))
+ @short_name ||= @name
+ @version = SCR.Read(path(".content.VERSION"))
+ @vendor = SCR.Read(path(".content.VENDOR"))
- @distproduct = Convert.to_string(SCR.Read(path(".content.DISTPRODUCT")))
- @distversion = Convert.to_string(SCR.Read(path(".content.DISTVERSION")))
+ @distproduct = SCR.Read(path(".content.DISTPRODUCT"))
+ @distversion = SCR.Read(path(".content.DISTVERSION"))
- @baseproduct = Convert.to_string(SCR.Read(path(".content.BASEPRODUCT")))
+ @baseproduct = SCR.Read(path(".content.BASEPRODUCT"))
@baseproduct = @name if @baseproduct == ""
- @baseversion = Convert.to_string(SCR.Read(path(".content.BASEVERSION")))
+ @baseversion = SCR.Read(path(".content.BASEVERSION"))
- @relnotesurl = Convert.to_string(SCR.Read(path(".content.RELNOTESURL")))
- @shortlabel = Convert.to_string(SCR.Read(path(".content.SHORTLABEL")))
+ @relnotesurl = SCR.Read(path(".content.RELNOTESURL"))
+ @shortlabel = SCR.Read(path(".content.SHORTLABEL"))
- tmp1 = SCR.Read(path(".content.FLAGS"))
- if tmp1 != nil
- @flags = Builtins.splitstring(Convert.to_string(tmp1), " ")
- end
- tmp1 = SCR.Read(path(".content.PATTERNS"))
- if tmp1 != nil
- @patterns = Builtins.splitstring(Convert.to_string(tmp1), " ")
- end
+ @flags = (SCR.Read(path(".content.FLAGS")) || "").split
+ @patterns = (SCR.Read(path(".content.PATTERNS")) || "").split
# bugzilla #252122, since openSUSE 10.3
# deprecated:
@@ -204,16 +209,18 @@
end
# not during testing: Misc::CustomSysconfigRead used by OSRelease creates agent in runtime,
# mocking IniParser not possible
- elsif !Mode.config && !Mode.test
+ elsif use_os_release_file?
@short_name = OSRelease.ReleaseName
@version = OSRelease.ReleaseVersion
- @name = Ops.add(Ops.add(@short_name, " "), @version)
+ @name = "#{@short_name} #{@version}"
+ else
+ raise "Cannot determine the product. Neither from the content, nor the os-relese file"
end
@distproduct = "" if @distproduct == nil
- @dist = Ops.get(Builtins.splitstring(@distproduct, "-"), 2, "")
+ @dist = @distproduct.split("-")[2] || ""
- @run_you = !Builtins.contains(@flags, "no_you")
+ @run_you = !(a)flags.include?("no_you")
# set the product name for UI
Yast.import "Wizard"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/library/packages/src/modules/SlideShow.rb new/yast2-3.1.41/library/packages/src/modules/SlideShow.rb
--- old/yast2-3.1.37/library/packages/src/modules/SlideShow.rb 2014-04-02 11:23:23.000000000 +0200
+++ new/yast2-3.1.41/library/packages/src/modules/SlideShow.rb 2014-04-09 12:00:12.000000000 +0200
@@ -158,6 +158,10 @@
@_stages = {} # list of the configured stages
@_current_stage = nil # current stage
+
+ @_rn_tabs = {} #tabs with release notes
+ @_relnotes = {} #texts with release notes, product -> text
+ @_base_product = "" #base product for release notes ordering
end
# Set the flag that user requested abort of the installation
@@ -232,8 +236,12 @@
# Check if currently the "Release Notes" page is shown
# @return true if showing details, false otherwise
#
- def ShowingRelNotes
- @widgets_created && UI.WidgetExists(:relNotesPage)
+ def ShowingRelNotes(id)
+ @widgets_created && UI.WidgetExists(id)
+ end
+
+ def ProductRelNotesID(product)
+ ("rn_" + product).to_sym
end
# Restart the subprogress of the slideshow. This means the
@@ -573,8 +581,8 @@
#
# @return A term describing the widgets
#
- def RelNotesPageWidgets
- widgets = AddProgressWidgets(:relNotesPage, RichText(@relnotes))
+ def RelNotesPageWidgets(id)
+ widgets = AddProgressWidgets(:relNotesPage, RichText(@_rn_tabs[id]))
Builtins.y2debug("widget term: \n%1", widgets)
deep_copy(widgets)
end
@@ -623,12 +631,12 @@
# Switch to the 'release notes' view.
#
- def SwitchToReleaseNotesView
- return if ShowingRelNotes()
+ def SwitchToReleaseNotesView(id)
+ return if ShowingRelNotes(id)
if UI.WidgetExists(:tabContents)
- UI.ChangeWidget(:dumbTab, :CurrentItem, :showRelNotes)
- UI.ReplaceWidget(:tabContents, RelNotesPageWidgets())
+ UI.ChangeWidget(:dumbTab, :CurrentItem, id)
+ UI.ReplaceWidget(:tabContents, RelNotesPageWidgets(id))
# UpdateTotalProgress(false);
end
@@ -647,6 +655,20 @@
help_text
end
+ #set the release notes for slide show
+ # @param [map<string,string>] map product name -> release notes text
+ # @param [string] base product name
+ def SetReleaseNotes(relnotes, base_product)
+ @_relnotes = relnotes
+ @_base_product = base_product
+ end
+
+ def add_relnotes_for_product product, relnotes, tabs
+ id = ProductRelNotesID product
+ #Translators: Tab name, keep short, %s is product name, e.g. SLES
+ tabs << Item(Id(id), _("%s Release Notes") % product)
+ @_rn_tabs[id] = relnotes
+ end
# Rebuild the dialog. Useful if slides become available post-creating the dialog.
def RebuildDialog
@@ -660,12 +682,15 @@
# tab
Item(Id(:showDetails), _("&Details"))
]
- if @relnotes != nil && @relnotes != ""
- # tab
- tabs = Builtins.add(
- tabs,
- Item(Id(:showRelNotes), _("Release &Notes"))
- )
+
+ @_rn_tabs = {}
+ if @_relnotes.key?(@_base_product)
+ add_relnotes_for_product @_base_product, @_relnotes[@_base_product], tabs
+ end
+ @_relnotes.each do | product, relnotes |
+ if @_base_product != product
+ add_releasenotes_for_product product, relnotes, tabs
+ end
end
contents = DumbTab(
@@ -778,9 +803,9 @@
else
UI.ChangeWidget(:dumbTab, :CurrentItem, :showDetails)
end
- elsif button == :showRelNotes && !ShowingRelNotes()
+ elsif @_rn_tabs.key?(button) && !ShowingRelNotes(button)
@user_switched_to_details = false
- SwitchToReleaseNotesView()
+ SwitchToReleaseNotesView(button)
elsif button == :debugHotkey
@debug = !@debug
Builtins.y2milestone("Debug mode: %1", @debug)
@@ -1021,7 +1046,7 @@
publish :function => :StopTimer, :type => "void ()"
publish :function => :ShowingDetails, :type => "boolean ()"
publish :function => :ShowingSlide, :type => "boolean ()"
- publish :function => :ShowingRelNotes, :type => "boolean ()"
+ publish :function => :ShowingRelNotes, :type => "boolean (symbol)"
publish :function => :SubProgressStart, :type => "void (string)"
publish :function => :SubProgress, :type => "void (integer, string)"
publish :function => :GlobalProgressStart, :type => "void (string)"
@@ -1036,7 +1061,7 @@
publish :function => :TableItem, :type => "term (string, string, string, string, string)"
publish :function => :SwitchToSlideView, :type => "void ()"
publish :function => :SwitchToDetailsView, :type => "void ()"
- publish :function => :SwitchToReleaseNotesView, :type => "void ()"
+ publish :function => :SwitchToReleaseNotesView, :type => "void (symbol)"
publish :function => :RebuildDialog, :type => "void ()"
publish :function => :Reset, :type => "void ()"
publish :function => :HandleInput, :type => "void (any)"
@@ -1048,6 +1073,7 @@
publish :function => :UpdateTable, :type => "void (list <term>)"
publish :function => :Setup, :type => "void (list <map <string, any>>)"
publish :function => :GetSetup, :type => "map <string, map <string, any>> ()"
+ publish :function => :SetReleaseNotes, :type => "void (map<string, string>, string)"
end
SlideShow = SlideShowClass.new
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/library/packages/test/Makefile.am new/yast2-3.1.41/library/packages/test/Makefile.am
--- old/yast2-3.1.37/library/packages/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-3.1.41/library/packages/test/Makefile.am 2014-04-09 12:00:12.000000000 +0200
@@ -0,0 +1,7 @@
+TESTS = \
+ product_test.rb
+
+TEST_EXTENSIONS = .rb
+RB_LOG_COMPILER = rspec
+VERBOSE = 1
+EXTRA_DIST = $(TESTS) test_helper.rb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/library/packages/test/data/content_files/SLES_12_Beta4 new/yast2-3.1.41/library/packages/test/data/content_files/SLES_12_Beta4
--- old/yast2-3.1.37/library/packages/test/data/content_files/SLES_12_Beta4 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-3.1.41/library/packages/test/data/content_files/SLES_12_Beta4 2014-04-09 12:00:12.000000000 +0200
@@ -0,0 +1,118 @@
+CONTENTSTYLE 11
+DATADIR suse
+DESCRDIR suse/setup/descr
+DISTRIBUTION SUSE_SLE
+LINGUAS cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW
+REGISTERPRODUCT true
+REPOID obsproduct://build.suse.de/SUSE:SLE-12:GA/SLES/12/DVD/x86_64
+SUMMARY SUSE Linux Enterprise Server 12
+VENDOR SUSE
+RELEASE
+LABEL SUSE Linux Enterprise Server 12
+META SHA256 defaa064a4dcc99292515dc8cd43de0d83d2c0414a832946926b17c527fe6973 app-icons.tar.gz
+META SHA256 6781ee1b3a39dd0792677569c2407ff03a22bf4534215961946e7526df3d6c57 appdata.xml.gz
+META SHA256 4800c7f468934e7fe7f76937d7458eb29d32b11626cc1f4e7d7c1818f26123f6 packages.DU.gz
+META SHA256 b5a4994300b5546496d8deeb37e52ed99c2253e39dd6d21703f0cbbd56ecb93a packages.FL.gz
+META SHA256 99dd0d213c2355c72a18c7d9c60677c548d1ed3d8d00d94b1594a5e115757849 packages.cs.gz
+META SHA256 43b9841b85288b8bedff21f86fe9a67ea8cd4b24031b776c823535b0b6406f00 packages.de.gz
+META SHA256 f678d98a9ee8f74634873f393e3e1414108ea8c93fb2c2c8ff5401705329105d packages.en.gz
+META SHA256 9e066f92ccce24182024d0fa30267a229fc4148d393615ee8270f28a4ed4b14f packages.es.gz
+META SHA256 381d05170924a56967ce0e6879b0ce267bd0ab68cda78d06fc505277c12bcfa3 packages.fi.gz
+META SHA256 b75e7ddea2dd3c94e20e62a94de1623b5ed1489bcd2e1799fb4d4e81148df74e packages.fr.gz
+META SHA256 0337d2c778829e043909ae51326d9f7ac2834f395841af6b1385ee859f072aea packages.gz
+META SHA256 d2ff7cbfc515d62888aac86f0b2ea91b582469f73fd3218c939b7b37dfc40b8f packages.hu.gz
+META SHA256 35c2fe0568f29affb94369b1ad1104f1cbeb3b5efe25f3179fd71ef48ce3aec2 packages.it.gz
+META SHA256 3142ba99ee37d72c432eaa647dece0f62c9ffcc33d5eb8c9291ffa4d08e67bef packages.ja.gz
+META SHA256 9b0292bb5cdddf19a98515e8f8ae94fab16b4f1b07c82157c5b0b7732344e561 packages.nl.gz
+META SHA256 2a5b77f7531a4955ecfa8e055e0c65d7255dba81ecb10b21a3e7aa2be04a244b packages.pl.gz
+META SHA256 3932a18268e9b690fddd4dfb3a1c6bcd43ac4437f26537145f6661a1fe5018b4 packages.pt.gz
+META SHA256 3de3e156abd356bc11d4a58980fa69b5d232e029f53f8fda89e3f9e6e1b2672b packages.pt_BR.gz
+META SHA256 7fa8bf8677b41e1e68638dd6624901e53d44552e0333ffd0d1717d9a04c5a6ab packages.ru.gz
+META SHA256 567b2db65922b1cbbeba349a784b1d0b1ee41d113a02c29d62888c26194a55f1 packages.zh_CN.gz
+META SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 patterns
+HASH SHA256 3c56471910cc033424cbe91c2e9f6acb7bd65497bfba52e84cd443448d5df017 license.tar.gz
+HASH SHA256 0ccdbae83696e3e777cd18e38142f18adc40aa668a22d1c14cbe80c925cab423 control.xml
+HASH SHA256 385c1941409e50e42f8ebc2e1dd5c681355071a49048a13e2936bc8059016967 media.1/info.txt
+HASH SHA256 d704d29e35bf9dfe9b7192c0a60e3017ef83b9cc9adef04ce2d8cf4b15024d34 boot/x86_64/arphic-uming-fonts.rpm
+HASH SHA256 44877029ea26dd501fdc54c4786d6021b73122c038325c48091493a3ee139eb3 boot/x86_64/bind
+HASH SHA256 a02f3db014bd291d1e71f39dd9ead6957fdab011a1555fc0f3c51021f511b199 boot/x86_64/common
+HASH SHA256 6a44667b01d126a52e5c2cc1cabc898903ec8e41cabea0d870b72af07c1dff23 boot/x86_64/config
+HASH SHA256 7a3bde5d20ef246033698ea7ecf2f41f462b592056bae20526efb37df665b7c1 boot/x86_64/cracklib-dict-full.rpm
+HASH SHA256 1bb0c7956a68060e065555fda0c7d2d46956b41bf2b35cd41c8c3ea4beea7479 boot/x86_64/efi
+HASH SHA256 c518c3b156d6d5312c5045cbe17c5b087b688e693ccbf39853ad08f4a05adcc7 boot/x86_64/gdb
+HASH SHA256 f54b88bc0d4b82e98c6dba9aba8cb33c2e786833d8e40f6135b86e98842931b8 boot/x86_64/indic-fonts.rpm
+HASH SHA256 fdd6bb0b661206fdc62e62ca363de8c55a093fb4c02f4f030510dc9c0d54a41e boot/x86_64/initrd-xen
+HASH SHA256 9e6d01d851ac02a73f55afca5e75d8d31bb37b03afdfdc2af638b9242f51e441 boot/x86_64/ipa-gothic-fonts.rpm
+HASH SHA256 88f8d7cd58b04c8b71f1e9c7a6b9217790283632605b87441ea2b0ab7c565a64 boot/x86_64/khmeros-fonts.rpm
+HASH SHA256 87ad5a0902680768789c20c6278994e66c0c9951970363a5da4efc3b1342a004 boot/x86_64/mkbootdisk
+HASH SHA256 7b49c3cde57e14942bbf21c715a5a32eac4bcf3e9c5b5a1478b9f5bd9e3e7572 boot/x86_64/rescue
+HASH SHA256 9d1a89da63b5711370d15cf37a9c610f0c7595e5be25ea9e67878db0f164ba3f boot/x86_64/root
+HASH SHA256 24d328ef64d5921afcc3488cbfcf9b7b7ae5a306f316e5a0d28f52b95c4ec75e boot/x86_64/rpmlist
+HASH SHA256 c16f67ed3a176f3424071f690fef2be1b2b59838de977e0b2a2fa311dfc0df4e boot/x86_64/thai-fonts.rpm
+HASH SHA256 52ce608c9620e8ef604a0a3b28457d3f99b0ddd25d06525ed6b0fe7d95b8415d boot/x86_64/un-fonts.rpm
+HASH SHA256 12474c4267960ba11174191c73c1a579a402f21101e62849135db91f32b42447 boot/x86_64/vmlinuz-xen
+HASH SHA256 1cb21283dea60553a217b237f6d3debdf20496e3a92eb65272d6e2c4573dc7ff boot/x86_64/yast2-trans-af.rpm
+HASH SHA256 47f4ad637d8b686ddeb95e6aefa4b81a1360840bd13bbddb1b7bd78509985d58 boot/x86_64/yast2-trans-ar.rpm
+HASH SHA256 8a566add84b7fa1a55ddeecb0a2c0cfb4b245e7ad6e8ffe64c4a7931383e2fcc boot/x86_64/yast2-trans-bg.rpm
+HASH SHA256 4341ca008433f1c9a0755ad438404d677df0c5b68bfbb8386e49cb9573b74380 boot/x86_64/yast2-trans-bn.rpm
+HASH SHA256 e30d7554cee72c46121b104cee1e31e3cc6e17e7589accfbe9a33d81c04ee255 boot/x86_64/yast2-trans-bs.rpm
+HASH SHA256 f194e0cbb66f82623cfadb6acc0f0c22bb5d4aa5742b400e19d4eda443175d2c boot/x86_64/yast2-trans-ca.rpm
+HASH SHA256 e5b9af807dabfad9b19dbc6c4aaa8fe3138ef4dbd81a0b2ae8aa2be14e1efd5a boot/x86_64/yast2-trans-cs.rpm
+HASH SHA256 9b16be3aefd02c43a1b7f700cdb4cdd4bcb67edf74e0940d9e79c57bcdaaebff boot/x86_64/yast2-trans-cy.rpm
+HASH SHA256 30bb79027b12a618edff8b60b0b2691c983a2341c9fcfe960d3bc802168bad1e boot/x86_64/yast2-trans-da.rpm
+HASH SHA256 613ee3d36a2d01c0ed6a8fe49358e2c0e87fd69ee69b0a3b4259b85b1c26bdb0 boot/x86_64/yast2-trans-de.rpm
+HASH SHA256 1d18e28f608505263450c38dae4be4a5d18c333c42e26faf588e3ed23c711eca boot/x86_64/yast2-trans-el.rpm
+HASH SHA256 8b82fec5801d35d6dae6d234d6ef1b5decdb059bcde3cb6c80f1f8b38df74f56 boot/x86_64/yast2-trans-en_GB.rpm
+HASH SHA256 18eedd9a39b7f146b5b3f0c2e44b45aaa3870d4cf93efafaef24cd610b264acc boot/x86_64/yast2-trans-en_US.rpm
+HASH SHA256 8a172d59bd84667da62b8271e4363336ed411be2fb0212a98c9610c7e4c4fee6 boot/x86_64/yast2-trans-es.rpm
+HASH SHA256 f147c8518766d5f00c451461363f7f539b3ed65e3ff37653095320bec243326d boot/x86_64/yast2-trans-et.rpm
+HASH SHA256 6f9a2c5437c1582e7a56f5d852ee3bf1b021551e200e305a42a534a254c05330 boot/x86_64/yast2-trans-fa.rpm
+HASH SHA256 559349ba3b1543e57d9e796c9e7aca2aa6eb7b6c216e8acb0c5844b1700a9cda boot/x86_64/yast2-trans-fi.rpm
+HASH SHA256 0e0ddf17f87051dc38163c52f38a9fd098160101f07df8f6f87f7bb57a74cdfa boot/x86_64/yast2-trans-fr.rpm
+HASH SHA256 70a2ab180bfb67b98c7d65034bfa83bfbe9c6680dd49f5f01e1e6d2e59640e7c boot/x86_64/yast2-trans-gl.rpm
+HASH SHA256 d88087c242fefdc7124a0f0735aabb25dbe5638be91d1d22116ebb2f50c83eb3 boot/x86_64/yast2-trans-gu.rpm
+HASH SHA256 0ee9e8fef8e476fdde815418f92899889e70e80014b2afc34820709c6c0a19e7 boot/x86_64/yast2-trans-hi.rpm
+HASH SHA256 b4789a9c58d97d631c765877a7e3df2592696dc532437d7f055edc098257bdeb boot/x86_64/yast2-trans-hr.rpm
+HASH SHA256 d6efca6ce0d2b21b22ef98645a023b6f07674e825de8900cb49019afad4bb2bb boot/x86_64/yast2-trans-hu.rpm
+HASH SHA256 c9a68c6c095c80d058355b9237699c9a05943f8f45b1045e70f2cf860e4f6fd7 boot/x86_64/yast2-trans-id.rpm
+HASH SHA256 4d97c393a0584fa4122b57462e7143c172739773976139db8b477185b3e499e0 boot/x86_64/yast2-trans-it.rpm
+HASH SHA256 ec329ab1a64b6434e6ee4b88863fa0c359009c26f4052d6d1e25d1bac5d52908 boot/x86_64/yast2-trans-ja.rpm
+HASH SHA256 90eb1507c642d2130913188373073e947103d9abf455f0c9e2472c91bcb12469 boot/x86_64/yast2-trans-jv.rpm
+HASH SHA256 613e7263ae0d3924a90e50a95379f95a6fabee6139dc78bde1fb233c59cc34bc boot/x86_64/yast2-trans-ka.rpm
+HASH SHA256 f25dde54f46b0fe499791fa18abcaeee43164266d318b0add23989f8a101ee9a boot/x86_64/yast2-trans-km.rpm
+HASH SHA256 41b3a1b3b529862a02697744cce2bb7771db073c8d2e3147b42aa69dff02d00d boot/x86_64/yast2-trans-ko.rpm
+HASH SHA256 dc468af3cd6c8132cffa524cc2edcb504c4b6f98e1c69c83136dcb0ab8b9538c boot/x86_64/yast2-trans-lo.rpm
+HASH SHA256 ec8bb3035e1170008d1d3528e74d1d52114345c6e9e0cbd71bd04c6d2299a1a9 boot/x86_64/yast2-trans-lt.rpm
+HASH SHA256 ff6d280568dbcd4a81b5087a6293ff79e3c4794fc088f0dd15d96d3524b84587 boot/x86_64/yast2-trans-mk.rpm
+HASH SHA256 24b8e38e959c66ca9472bbc0ea0e9e084346b98769c0b747562ef7fc8b150d6c boot/x86_64/yast2-trans-mr.rpm
+HASH SHA256 8061b5369b6690aebc138e0e6ed9dd6d10d1d82daee1ca84af775d74076ecb2f boot/x86_64/yast2-trans-nb.rpm
+HASH SHA256 203864a002efec7ec805f37a37c344212372d27f2441b258b2f455af936a55cd boot/x86_64/yast2-trans-nl.rpm
+HASH SHA256 627b57df80aa97b0e6e4f0fadc9a395d8e7651330c6a5754b995b26f2c1bf875 boot/x86_64/yast2-trans-pa.rpm
+HASH SHA256 c5875eef6affad4c153e7cfc41b3379657c0883a283995ac5e90c27621fa8794 boot/x86_64/yast2-trans-pl.rpm
+HASH SHA256 985efa6ce1d1d6841549442aed29597b157c98a6794b532e4af873dc75b44da6 boot/x86_64/yast2-trans-pt.rpm
+HASH SHA256 b48e88beb2282136944fc7f98fcfe05af1c6c9024b74079562bd34512d72cc9a boot/x86_64/yast2-trans-pt_BR.rpm
+HASH SHA256 b6960f2808b7b3fe3eb6f40af3ac8de26ad870cbf6cc6ab46c305508765f0c4a boot/x86_64/yast2-trans-ro.rpm
+HASH SHA256 3ebdca69566f0a5521506d189ac9eec1472eb5cd89bb4061b2c8a5a2b88103d2 boot/x86_64/yast2-trans-ru.rpm
+HASH SHA256 7da30fe592ecc3c2463e78c170ec711810c606568fdad92f7386dddbc6cab802 boot/x86_64/yast2-trans-si.rpm
+HASH SHA256 32407c1f48949c52b27a4075d3e55e6f33f581dc18eb16d780bdad7a6da85e99 boot/x86_64/yast2-trans-sk.rpm
+HASH SHA256 20e0bcb82ac0667c6f13cb8f07e47c9114d3abd01fa1cc87c6256f7be6bee5d4 boot/x86_64/yast2-trans-sl.rpm
+HASH SHA256 8a3e3cdad8a13e90bb9946458ba6e76619c8486c37f8096b8379871c09664fc3 boot/x86_64/yast2-trans-sr.rpm
+HASH SHA256 3fcc32c883a5b480e9b0a3005da79a6e155d9aa759d91d7f4b6fda502a0a4d8e boot/x86_64/yast2-trans-sv.rpm
+HASH SHA256 091b324b2d1d1e269fcb879aadaa8cb7d3a827907acaf93edf10b7a297db37fd boot/x86_64/yast2-trans-ta.rpm
+HASH SHA256 bffa6821ce64588ade44f7ee86ab810e8b3717ab0043e78f5380a99312f0adc2 boot/x86_64/yast2-trans-th.rpm
+HASH SHA256 501736601af1d692a719300c6c36e05f651368ecb91f183ab86c93c2000fb9d9 boot/x86_64/yast2-trans-tr.rpm
+HASH SHA256 92cce4b41c4a96c2dc92a6e82582d1d487f8d6527b898112202e57e38a3012bb boot/x86_64/yast2-trans-uk.rpm
+HASH SHA256 2b776b3a192bbed3a5b3efd2da496014057f66972b0a2e6e1c76a078634180bf boot/x86_64/yast2-trans-vi.rpm
+HASH SHA256 8614a55f2828636b3d48cf72d2ef288a83ffcc6a480799eb08f0b686fd3ac56d boot/x86_64/yast2-trans-wa.rpm
+HASH SHA256 2d21d37be00e3605d5a9a0bade23d864ae54fa391b813bcc0bef1f0b6f22067b boot/x86_64/yast2-trans-xh.rpm
+HASH SHA256 deb02fc45cbb5ae60eff5f8d709e8dfff51a79954e3c79d7818804051a55a0c5 boot/x86_64/yast2-trans-zh_CN.rpm
+HASH SHA256 2daf6740945d9bf56eacfb3789e3e73e21b4ab9337ab7da8e13dc1156646a4fc boot/x86_64/yast2-trans-zh_TW.rpm
+HASH SHA256 86181848bf024542f7c0dd082ca354167a5f4f5b9623d2e6f574193f1544c9aa boot/x86_64/yast2-trans-zu.rpm
+HASH SHA256 3531a4cee4e502e891e296562960a1f154f588a31bacdcb5713c4fa840764a2c boot/x86_64/loader/linux
+HASH SHA256 3ca4f3f52b22d2cadfedfcc4552cfbface51562f767b9daa5f07cec6af669a3e boot/x86_64/loader/initrd
+HASH SHA256 66f2f83a34d832de2e7fc18eca59813d3497ca24c3cd954b5cf98961a479c911 docu/RELEASE-NOTES.en.html
+HASH SHA256 4db99b77702457fc0b8bedc4f70c691a3b12b322646a85b2c06fa21477967db1 docu/RELEASE-NOTES.en.pdf
+HASH SHA256 66f2f83a34d832de2e7fc18eca59813d3497ca24c3cd954b5cf98961a479c911 docu/RELEASE-NOTES.en.rtf
+HASH SHA256 789f911aee49b889a373cb368a6cdeaf69c90803c21439e53f9f89cd5272e0d3 docu/RELEASE-NOTES.en.txt
+KEY SHA256 cf04fe3267f44cd2d8de08ba72d70c35584b521c107eb1970b4014a9ba117c2d gpg-pubkey-39db7c82-510a966b.asc
+KEY SHA256 c3bef402223b6b35cb857e0775cca8eedbda64e37f052af8d222a35dddc7f4a2 gpg-pubkey-50a3dd1c-50f35137.asc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/library/packages/test/data/content_files/openSUSE_13.1_GM new/yast2-3.1.41/library/packages/test/data/content_files/openSUSE_13.1_GM
--- old/yast2-3.1.37/library/packages/test/data/content_files/openSUSE_13.1_GM 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-3.1.41/library/packages/test/data/content_files/openSUSE_13.1_GM 2014-04-09 12:00:12.000000000 +0200
@@ -0,0 +1,134 @@
+BASEARCHS x86_64
+CONTENTSTYLE 11
+DATADIR suse
+DESCRDIR suse/setup/descr
+DISTRIBUTION openSUSE
+LABEL openSUSE
+LINGUAS cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW
+NAME openSUSE
+RELNOTESURL http://doc.opensuse.org/release-notes/x86_64/openSUSE/13.1/release-notes-op…
+VENDOR openSUSE
+VERSION 13.1
+RELEASE 1.10
+META SHA256 22b76833801210a252ed1a00b6c5d4c800c89a24bcd7162592f561d9b8c636b7 app-icons.tar.gz
+META SHA256 02bfee819d968a97f7a31a29265ee017ad1fcc465bd46b3ced220616f4f1a070 appdata.xml.gz
+META SHA256 e533789cded733ee63c8de8966541c9fb7976f248699cb5b5b0ba9f70df55429 dvd-13.1-13.6.1.x86_64.pat.gz
+META SHA256 48e95ebba4f6d332378ca343451defbc053073a0adf3521969fffe74fb080923 packages.DU.gz
+META SHA256 c1c000324bbf7cc67d64c5d2403a3836d091ad5e9bbd18bfe932816c90bb837a packages.FL.gz
+META SHA256 cb32ba94f11c1f574cdb807643df5356ac40d7a46ab39ed1912dde237cf87413 packages.cs.gz
+META SHA256 12a6328a3f1ea13854e17306fafcc7a68d17ca703ef80d467aed27fd30fb8649 packages.de.gz
+META SHA256 d8197911e272b452df1441160153c115ad4a559ef60fb4f69a2bd881a724d387 packages.en.gz
+META SHA256 b86ef2fe33138f8593326538f8197aefdcab04bb71f3b6fbb1811798720cf730 packages.es.gz
+META SHA256 ea74f7a8941362fb0d578865b003c0228c6564c5c95a72edd049c27e011344ad packages.fi.gz
+META SHA256 fd7a7b72a0a2b946b78909ea358fb0a9d7a2ff7c719bed6fadfc979892227564 packages.fr.gz
+META SHA256 6f451df38a626e6c90c988e5da2e48b4800a61b9f9a201c4f784deab4d3c247a packages.gz
+META SHA256 829ec83fa77ba368829bb7801b4e8c4023facebc1194f3f9f4b75d663c58a141 packages.hu.gz
+META SHA256 6668f8b284d9e05f096ea9f5ba47da8fa416b493654257f3a435157528c4fd9e packages.it.gz
+META SHA256 df2ad0057133e2df56e9bc04df4677f0b5351fbfa25504099e055d512e9f1455 packages.ja.gz
+META SHA256 4a276d1585c4c85a98dd9fa5256d26f1e9898a819c4a393ddd0db1b2399c90e8 packages.nl.gz
+META SHA256 89aa0713b08e90f236eff93f3a8ba5ef1c9a61425c214ac655698e36bccff8f5 packages.pl.gz
+META SHA256 aa6b2d20304fc107689d467f6429aee89511e977a4b83b6dd463ceb0d26a450b packages.pt.gz
+META SHA256 51f3c201955ed4e75fff64668d366154517914adcb1815523dddf245c49058ad packages.pt_BR.gz
+META SHA256 4174f1201bccb8df8c35e3d2f68fac253286eeefc7fdd3b52e16df574864f0a8 packages.ru.gz
+META SHA256 16f227617049ab685901fec9132d472ed8f3b41c3059c775a9a934929b86640a packages.zh_CN.gz
+META SHA256 2f4636d20dedc934440f265800ef056fb4763a201d6c826e6e7f33d63795a4dd patterns
+HASH SHA256 88e80af6d7d00c9e1c68394af40079407e243ae10f508d68843cf15bb41e2eaf license.tar.gz
+HASH SHA256 74c04e33bbac86db0cd5af004d08cf19af62c81d179c7018678206c267c6f8b2 control.xml
+HASH SHA256 b5b09c6fbc81f7c5b00ac38a5dc768bad2601ef48d1c1b2df28009ff28a87c0a boot/x86_64/arabic-fonts.rpm
+HASH SHA256 0a43cd62931660b87821bed8470b972e86bf173a5b29536ac6d2449e86cd87f3 boot/x86_64/arphic-uming-fonts.rpm
+HASH SHA256 906038fec0baed45e80ee9edffb303ab6ab6b8b624d5721d9fd8f47e276dca8d boot/x86_64/bind
+HASH SHA256 a4859679441c231b57caa1ed84eeec11bb0217574a83f938defaa1dbe37a5d2b boot/x86_64/branding
+HASH SHA256 c8109a0a4fde9646ca1e8bc502c1f0bda214df5cb32ae09ac46721028e337a83 boot/x86_64/common
+HASH SHA256 bbfa1254ebddb53373f9450892edf5af235639de753469ec5f4da9a8184131f8 boot/x86_64/config
+HASH SHA256 e7bf49433cdd4ee14924ed3dcb2f259ae7bfab1ceb60fa1545ac526a90b7ee0f boot/x86_64/cracklib-dict-full.rpm
+HASH SHA256 6657adc65688f67381eb08e2bb2b2245bd6aa2d32bcba9a61f3c9aeaa415fd02 boot/x86_64/efi
+HASH SHA256 1462345268f15c8d83ba353614649b44100ef8411b3b5841a492f164a287536d boot/x86_64/gdb
+HASH SHA256 1b15d6d28bc74279941fdaaaa93ef39345ff9ef1c5f91fdc86692c60796c42f4 boot/x86_64/indic-fonts.rpm
+HASH SHA256 5ae12d76d2ef210416347630d125d9de93b2abeade0676ff728d9392c0f3db2b boot/x86_64/initrd-xen
+HASH SHA256 202817279ab2ea62c041257fc90bd0fad45f2ee8ac4178a3d3f99f4da5c48326 boot/x86_64/ipa-gothic-fonts.rpm
+HASH SHA256 8503c74be2fefab329fc6b6ce4605b16efcc491f616831f26960080bcda893af boot/x86_64/khmeros-fonts.rpm
+HASH SHA256 01b9029a0653995c15f98114145db918b7ccb4f284f4343b957b83d8ebaf306c boot/x86_64/lklug-fonts.rpm
+HASH SHA256 a28408defa649eb0b765b9d50752ae27d66d59a92e9659168a29f1c94fa7e7c9 boot/x86_64/mkbootdisk
+HASH SHA256 a4859679441c231b57caa1ed84eeec11bb0217574a83f938defaa1dbe37a5d2b boot/x86_64/openSUSE
+HASH SHA256 83ae6c1b0b2d2f11e35099b42ebc74a56d8b57ad54aec6cfeb8773ac8ec0ee2b boot/x86_64/rescue
+HASH SHA256 c3aedcbacdab15d85f80864946f69760bd8ce03f5a698abfa14aaef7fc5ca6cd boot/x86_64/root
+HASH SHA256 24d328ef64d5921afcc3488cbfcf9b7b7ae5a306f316e5a0d28f52b95c4ec75e boot/x86_64/rpmlist
+HASH SHA256 ec62cca55983dd1051fdabd6019198a3710db30ba5d854834c1fae4eb3fae200 boot/x86_64/thai-fonts.rpm
+HASH SHA256 8ceed03c8ef4456bba703280af0da873529512fed2cc426bcc9561d08f893743 boot/x86_64/un-fonts.rpm
+HASH SHA256 8138638d5607f5b5a9f333fb786aad99a81f31c833412c26e496542f1d63243d boot/x86_64/vmlinuz-xen
+HASH SHA256 78df153357ec508359bbc793b13f595b9e4d5aeb6374b3de96fa6584007652a2 boot/x86_64/yast2-trans-af.rpm
+HASH SHA256 fa72160684044687669b0b1140043b41ec122ba1c9404b9417478cf1bf2de3bd boot/x86_64/yast2-trans-ar.rpm
+HASH SHA256 6ba65a3a97b92365b6a8af3bcd3a309a8de189a38c0700f5d1b26f6f1540e129 boot/x86_64/yast2-trans-bg.rpm
+HASH SHA256 7d2262e53d7b4bf3bde8beab827adb3a27b7f189091d29f6fd35f384757137a7 boot/x86_64/yast2-trans-bn.rpm
+HASH SHA256 effd28b8ce6760022570cb79654d8e56aa7071adabcf8d392d7c677c89ea2a3b boot/x86_64/yast2-trans-bs.rpm
+HASH SHA256 8e7130a38937cd332a59d64f3109a709f9ca3db304bae1d70cc98571404da67b boot/x86_64/yast2-trans-ca.rpm
+HASH SHA256 6ff78cad8530930f42dcfe92f2bcb7aa629a5cf2dc881bcbc6e7299d6bbde752 boot/x86_64/yast2-trans-cs.rpm
+HASH SHA256 f873c8f29be001e711e69226ae5b14ed6336ddbe3213284db148383abcfea4fd boot/x86_64/yast2-trans-cy.rpm
+HASH SHA256 50d5b57e7d309e34788dbf5047b144a61c0037aaddeacbcef5b5904ba67d38fb boot/x86_64/yast2-trans-da.rpm
+HASH SHA256 0367f050e6d0bff8aee1ce6568177937b944a2510adcf1024c1cad4cff7f7a45 boot/x86_64/yast2-trans-de.rpm
+HASH SHA256 020d33d35b9cd2f28cf5640bbcc3159446c3e1df78e10147b09e7a0351b331c4 boot/x86_64/yast2-trans-el.rpm
+HASH SHA256 96cc2db2319f0b7945dd22feba9a150b44f20510aac2b8e71eb70194a76d6980 boot/x86_64/yast2-trans-en_GB.rpm
+HASH SHA256 91f982f4605aeb319b918a54fc4d9dae3a7bd4c59a572b0472808785764f8876 boot/x86_64/yast2-trans-en_US.rpm
+HASH SHA256 f9ad4f5c50550a7cdb64dda80e04328b587badde74183226d4be0385bca5e448 boot/x86_64/yast2-trans-es.rpm
+HASH SHA256 38c9a284592feb4699ac7ff2e583bf7ac6478544493b3c7dbbec92b7176d917d boot/x86_64/yast2-trans-et.rpm
+HASH SHA256 44be0d078928806c801c4e49888636b4cb53badf677047e555557263d012cfef boot/x86_64/yast2-trans-fa.rpm
+HASH SHA256 82940fd86ad553cb5e9ea04a12607066897f02fa6f86eb88f8fd9131202abeda boot/x86_64/yast2-trans-fi.rpm
+HASH SHA256 e283339638c62a6c4da3bcd938f853f5f93f6f4ee5bd5993704aa9fb96a59954 boot/x86_64/yast2-trans-fr.rpm
+HASH SHA256 3eff60446d38e5b3ced9367a18bd216ea32386b300f1f6c96438b0c908187b08 boot/x86_64/yast2-trans-gl.rpm
+HASH SHA256 1924ccab5c86257b1a46c510bbf8e6be29eb56e9126e08fa01aea3e222bb86ed boot/x86_64/yast2-trans-gu.rpm
+HASH SHA256 12410aa1644198d0d843b2ec3f9f756aacc51d31b8271aa40b52bca774e953be boot/x86_64/yast2-trans-hi.rpm
+HASH SHA256 4d7140f794bf85ea28a53f0d74bc0da299cdcdad780a23ddd369633bd05753df boot/x86_64/yast2-trans-hr.rpm
+HASH SHA256 2fe82d1ccc01367b54c8576044353b78bc51cd3f6a95f61bce527924fb43b382 boot/x86_64/yast2-trans-hu.rpm
+HASH SHA256 439532f45f1302523013844fe5c424829e52ce6bfdf98bf2daed953bffd39c8a boot/x86_64/yast2-trans-id.rpm
+HASH SHA256 18aba1dd3e21db1bf88052f7c761df2a28e7e1c04024893217b20544e6317ed0 boot/x86_64/yast2-trans-it.rpm
+HASH SHA256 3bf826b3d9fcbdd80bd2295afc72be6ec3905c69ff2d5042e06ba2a53ddac8d8 boot/x86_64/yast2-trans-ja.rpm
+HASH SHA256 d54f9428c169f541966735589335e61bc5b25e3b87299f8bde7433f0449420ab boot/x86_64/yast2-trans-jv.rpm
+HASH SHA256 40b606e7ef982c0437e2783cdb32a1574600891fa7ab73b39a843681557bbb68 boot/x86_64/yast2-trans-ka.rpm
+HASH SHA256 4cd0b59a05ef80ad2e032a8c48b78604d0ba8177eaeeff8bb4d3a5b336f29ca7 boot/x86_64/yast2-trans-km.rpm
+HASH SHA256 7ed47f3a0b31a1d108e6ea9f8632b320a6cd2ee6500cc3cc3eaeb073f174f590 boot/x86_64/yast2-trans-ko.rpm
+HASH SHA256 eb284f364568f21caab714ea310f1312340f19d1eee33c6d738e82892c0cfb20 boot/x86_64/yast2-trans-lo.rpm
+HASH SHA256 f9fde6182669f1353783255288838efafe74576e1480fb193e867d0c2d9214d0 boot/x86_64/yast2-trans-lt.rpm
+HASH SHA256 c3abd9c551a785f88f95f40c82f982fc28d8d8b4dd8df7b9bc1cc1a6a4aebf41 boot/x86_64/yast2-trans-mk.rpm
+HASH SHA256 9ee12d09ec5908af3c42e99b60fa09c4dd5e6007896c2a21e96f00d4e905a9e3 boot/x86_64/yast2-trans-mr.rpm
+HASH SHA256 49f10b91685bb03a13270f4d19c7aeca3a0c974e7d4093373217b2e93bef1d2f boot/x86_64/yast2-trans-nb.rpm
+HASH SHA256 8cea01ddc6adc5599f448b2116d32628e4712e92b5f3a9faa9657abb7b0ab8b3 boot/x86_64/yast2-trans-nl.rpm
+HASH SHA256 595600b69f6eda4864020e3d1fe620de73db2efd7705461b7a69acc59157de64 boot/x86_64/yast2-trans-pa.rpm
+HASH SHA256 d33cba6e4203394d56e93569f04a1508cb8631b450dcd5aac9e212d6be2200c1 boot/x86_64/yast2-trans-pl.rpm
+HASH SHA256 756faaa0323c541d825349d56dadbd14b493d82da4a1f1ae78aedbc65634f7aa boot/x86_64/yast2-trans-pt.rpm
+HASH SHA256 edb11e44887e4014978c6286fbe8f3095eff9ccaf7610087553eb5db7c1b59a2 boot/x86_64/yast2-trans-pt_BR.rpm
+HASH SHA256 b13d9e05098792e8e393dc8c48bcfd4ecbb0f815e8f5e3d5fbf8aaa9515ec60c boot/x86_64/yast2-trans-ro.rpm
+HASH SHA256 cd297f102ad6aacb82794292b4db0e37ec14ebde8b8b20ea8c34bd985237058f boot/x86_64/yast2-trans-ru.rpm
+HASH SHA256 1d99700886396e5bcfde2cb3cccbf6bec0382303d6bcc116e18825237ba03fed boot/x86_64/yast2-trans-si.rpm
+HASH SHA256 0ab012464067a601d191933f1dfd0cc813bd9ffb3dbe7f636dfd3e2d86710285 boot/x86_64/yast2-trans-sk.rpm
+HASH SHA256 59dfe030555208c9bb8a87b28f3e8b88370ab9e02ef8c172cac6d6f953def2b9 boot/x86_64/yast2-trans-sl.rpm
+HASH SHA256 8a934ef66bc060710c386e5c6096bf451743797c2fa3935131c4e6a46f135163 boot/x86_64/yast2-trans-sr.rpm
+HASH SHA256 4a4a04558d1558f168feaa4503bb7af5080eed5e79c3c775eec38c5deedbd61e boot/x86_64/yast2-trans-sv.rpm
+HASH SHA256 5226a2b01c2ce81b7e0f81b359a3f3b5abe77113f4c640cb791c72a5971017d0 boot/x86_64/yast2-trans-ta.rpm
+HASH SHA256 3bc3031532e509120043d03d25f3ea6d54d23ee8f5747a9fdc9e94794bc2b005 boot/x86_64/yast2-trans-th.rpm
+HASH SHA256 55d3fb46ff64b656f4d32866be5d7485fddb4eec968a9cc190df17304e94edbf boot/x86_64/yast2-trans-tr.rpm
+HASH SHA256 b4a9c8a35aa3eed1ce9e1f2766a0f8735e9e2950b87461917ec85d1c4b4e6792 boot/x86_64/yast2-trans-uk.rpm
+HASH SHA256 a05bd29d45ac72c00be0a4ecc012acae6ebce784bc85c86f5a7ffc0c338b708f boot/x86_64/yast2-trans-vi.rpm
+HASH SHA256 81a8c545cbbe3a76c55aab171d36ac0a32974924dc7ad7a4e3ab1b56b98a5cf7 boot/x86_64/yast2-trans-wa.rpm
+HASH SHA256 f3f1348524de5df7ed502d49e3e92289c562c6c3528d73abb1e2c7164e6cd32a boot/x86_64/yast2-trans-xh.rpm
+HASH SHA256 c10e9fa8b905a4e002c6aa83ce11e6e9cbdf3419cdb84b47f71ebc520d2bbb89 boot/x86_64/yast2-trans-zh_CN.rpm
+HASH SHA256 7182aebe7a28a0c0fb2fe80a86004bcac1a5df388844fb1072b057a7ec620ad9 boot/x86_64/yast2-trans-zh_TW.rpm
+HASH SHA256 8709e4079ebf7a40aefe944397446345ff3360432435d6ec706d1eef0fd463d3 boot/x86_64/yast2-trans-zu.rpm
+HASH SHA256 8d7ebcc6110be10e4c92efcb22b9ec18eb7ca47082d0e1c75469762c3c6da896 boot/x86_64/loader/linux
+HASH SHA256 7133889fd485bb79cd8faeaade82962bc1725b0e55ab25963e1c7079b33f55cc boot/x86_64/loader/initrd
+HASH SHA256 29da2d4800c56997f42b0b3b1fa2217e4941d5190b2c65495302a4ab19b2b424 docu/RELEASE-NOTES.en.html
+HASH SHA256 29da2d4800c56997f42b0b3b1fa2217e4941d5190b2c65495302a4ab19b2b424 docu/RELEASE-NOTES.en.rtf
+HASH SHA256 d6d275f7c9fdf9a35e4f9028de1cd5497bba23532df6aaef421bbd69765e3abc images/base-meta-x86_64.tar.xz
+HASH SHA256 cad69c81b7e1484d61632e583b7bfe057a3f829356ada53fd6e37d93ffc1299c images/base-x86_64.tar.xz
+HASH SHA256 1028483b2f5aad6068f0c3a3f83841b86dcd50adac84ea4b91cdef9d9428f0f8 images/common-base-x86_64.tar.xz
+HASH SHA256 8e08dace336fc6f8d233208a41392526c82a8230463d799c2b797158bf95d38d images/common-desktop-x86_64.tar.xz
+HASH SHA256 c15a8d4461c53883a21b8d9a847b8223c2b79b766bb6b583457bf3850bb2b2ad images/common-xorg-x86_64.tar.xz
+HASH SHA256 28bb97af6cb529c464a196ba0e8368ac8e7e74a7a4048a6cc70f5f7dea3588dc images/details-x86_64.xml
+HASH SHA256 f965bbecd18f0a909ce29468132145552aa3bb34ced8706afc428bdf6412b300 images/gnome-meta-x86_64.tar.xz
+HASH SHA256 0b2545bc48852eab8ffad9954013c303b6b8d686b4e017304cf75155be3cd4ab images/gnome-x86_64.tar.xz
+HASH SHA256 2e178f14f455c7d90bde72026c59b38d76ba41d1973a6940f6bca55b98580022 images/images.xml
+HASH SHA256 f4cb3b17c8516bb464ec867461bbab4863c2405de144da477d156a169f192bf3 images/kde-meta-x86_64.tar.xz
+HASH SHA256 416acadec90c0f351dbf7e18cca46c04d093ef2b8ce3ed7e50fffbfd3e8e9a4a images/kde-x86_64.tar.xz
+HASH SHA256 0eb8dfc715e6506233d8f935cbc46d287d3b63af1e2338211e829b5b99ef9684 images/x11-meta-x86_64.tar.xz
+HASH SHA256 39b5f8b2195699863e9ea6d8064f35c70835e7213cabd10b6d4ca6de4d1e1b9b images/x11-x86_64.tar.xz
+KEY SHA256 d9f574c69457dc5ee30d8d143484677379d2e9229fa9fb7986462dd716d08ad6 gpg-pubkey-307e3d54-4be01a65.asc
+KEY SHA256 d44bd0be5ac11f1ca9b613375ef3d799d1d2ce83fa122d2e6366702af7100cb6 gpg-pubkey-3dbdc284-4be1884d.asc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/library/packages/test/product_test.rb new/yast2-3.1.41/library/packages/test/product_test.rb
--- old/yast2-3.1.37/library/packages/test/product_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-3.1.41/library/packages/test/product_test.rb 2014-04-09 12:00:12.000000000 +0200
@@ -0,0 +1,125 @@
+#! /usr/bin/rspec
+
+top_srcdir = File.expand_path("../../../..", __FILE__)
+inc_dirs = Dir.glob("#{top_srcdir}/library/*/src")
+ENV["Y2DIR"] = inc_dirs.join(":")
+
+require "yast"
+
+# Important: Loads data in constructor
+Yast.import "Product"
+
+Yast.import "Mode"
+Yast.import "Stage"
+Yast.import "OSRelease"
+
+include Yast::Logger
+
+# Path to a test data - service file - mocking the default data path
+DATA_PATH = File.join(File.expand_path(File.dirname(__FILE__)), "data", "content_files")
+
+SCR_PATH = Yast::Path.new(".content")
+
+def load_content_file(file_name)
+ file_name = File.join(DATA_PATH, file_name)
+
+ raise "File not found: #{file_name}" unless File.exists?(file_name)
+
+ Yast::log.warn("Unregistering agent #{SCR_PATH}")
+ Yast::SCR.UnregisterAgent(SCR_PATH)
+
+ Yast::log.warn("Registering new agent on #{SCR_PATH} for #{file_name}")
+ raise "Cannot register SCR agent for #{file_name}" unless Yast::SCR.RegisterAgent(
+ SCR_PATH,
+ Yast::Term.new(:ag_ini,
+ Yast::Term.new(
+ :IniAgent,
+ file_name,
+ {
+ "options" => ["read_only", "global_values", "flat"],
+ "comments" => ["^#.*", "^[ \t]*$"],
+ "params" => [
+ { "match" => [ "^[ \t]*([^ \t]+)[ \t]*(.*)[ \t]*$", "%s %s" ] }
+ ]
+ }
+ )
+ )
+ )
+end
+
+describe Yast::Product do
+ context "while called in initial installation (content file exists)" do
+ before(:each) do
+ Yast::Product.stub(:use_content_file?).and_return(true)
+ Yast::Product.stub(:use_os_release_file?).and_return(false)
+ end
+
+ it "reads product information from content file and fills up internal variables" do
+ load_content_file("openSUSE_13.1_GM")
+ Yast::Product.Product
+ expect(Yast::Product.name).to eq("openSUSE")
+ expect(Yast::Product.short_name).to eq("openSUSE")
+ expect(Yast::Product.version).to eq("13.1")
+ expect(Yast::Product.vendor).to eq("openSUSE")
+
+ load_content_file("SLES_12_Beta4")
+ Yast::Product.Product
+ expect(Yast::Product.name).to eq("SUSE Linux Enterprise Server 12")
+ expect(Yast::Product.short_name).to eq("SUSE Linux Enterprise Server 12")
+ expect(Yast::Product.version).to be_nil
+ expect(Yast::Product.vendor).to eq("SUSE")
+ end
+ end
+
+ context "while called on a running system (os-release file exists)" do
+ before(:each) do
+ Yast::Product.stub(:use_content_file?).and_return(false)
+ Yast::Product.stub(:use_os_release_file?).and_return(true)
+ end
+
+ it "reads product information from OSRelease and fills up internal variables" do
+ release_name = "Happy Feet"
+ release_version = "1.0.1"
+
+ Yast::OSRelease.stub(:ReleaseName).and_return(release_name)
+ Yast::OSRelease.stub(:ReleaseVersion).and_return(release_version)
+
+ Yast::Product.Product
+ expect(Yast::Product.short_name).to eq(release_name)
+ expect(Yast::Product.version).to eq(release_version)
+ expect(Yast::Product.name).to eq("#{release_name} #{release_version}")
+ end
+ end
+
+ context "while called on a system with both content and os-release files supported" do
+ before(:each) do
+ Yast::Product.stub(:use_content_file?).and_return(true)
+ Yast::Product.stub(:use_os_release_file?).and_return(true)
+ end
+
+ it "prefers content file to os-release file" do
+ load_content_file("SLES_12_Beta4")
+
+ release_name = "Happy Feet"
+ release_version = "1.0.1"
+
+ Yast::OSRelease.stub(:ReleaseName).and_return(release_name)
+ Yast::OSRelease.stub(:ReleaseVersion).and_return(release_version)
+
+ Yast::Product.Product
+ expect(Yast::Product.short_name).to eq("SUSE Linux Enterprise Server 12")
+ expect(Yast::Product.short_name).not_to eq(release_name)
+ end
+ end
+
+ context "while called on a broken system (neither content nor os-release file exists)" do
+ before(:each) do
+ Yast::Product.stub(:use_content_file?).and_return(false)
+ Yast::Product.stub(:use_os_release_file?).and_return(false)
+ end
+
+ it "raises error while reading the product information" do
+ expect { Yast::Product.Product }.to raise_error(/Cannot determine the product/)
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/library/system/src/lib/yast2/hw_detection.rb new/yast2-3.1.41/library/system/src/lib/yast2/hw_detection.rb
--- old/yast2-3.1.37/library/system/src/lib/yast2/hw_detection.rb 2014-04-02 11:23:23.000000000 +0200
+++ new/yast2-3.1.41/library/system/src/lib/yast2/hw_detection.rb 2014-04-09 12:00:12.000000000 +0200
@@ -43,7 +43,7 @@
# Return size of the system memory (in bytes)
# @return Fixnum,Bignum detected memory size
def self.memory
- memory = SCR.Read(path(".probe.memory"))
+ memory = Yast::SCR.Read(Yast::Path.new(".probe.memory"))
log.debug("hwinfo memory: #{memory}")
raise "Memory detection failed" unless memory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/library/system/test/Makefile.am new/yast2-3.1.41/library/system/test/Makefile.am
--- old/yast2-3.1.37/library/system/test/Makefile.am 2014-04-02 11:23:23.000000000 +0200
+++ new/yast2-3.1.41/library/system/test/Makefile.am 2014-04-09 12:00:12.000000000 +0200
@@ -1,5 +1,6 @@
TESTS = \
- kernel_test.rb
+ kernel_test.rb \
+ hw_detection_test.rb
TEST_EXTENSIONS = .rb
RB_LOG_COMPILER = rspec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/library/system/test/hw_detection_test.rb new/yast2-3.1.41/library/system/test/hw_detection_test.rb
--- old/yast2-3.1.37/library/system/test/hw_detection_test.rb 2014-04-02 11:23:23.000000000 +0200
+++ new/yast2-3.1.41/library/system/test/hw_detection_test.rb 2014-04-09 12:00:12.000000000 +0200
@@ -1,7 +1,6 @@
#! /usr/bin/rspec
require "yast"
-include Yast
require_relative "../src/lib/yast2/hw_detection"
@@ -34,22 +33,22 @@
describe "#memory" do
it "returns detected memory size in bytes" do
- SCR.should_receive(:Read).with(path(".probe.memory")).and_return([@memory])
+ Yast::SCR.should_receive(:Read).with(Yast::Path.new(".probe.memory")).and_return([@memory])
expect(Yast2::HwDetection.memory).to eq(@ramsize)
end
it "sums detected memory sizes" do
- SCR.should_receive(:Read).with(path(".probe.memory")).and_return([@memory, @memory])
+ Yast::SCR.should_receive(:Read).with(Yast::Path.new(".probe.memory")).and_return([@memory, @memory])
expect(Yast2::HwDetection.memory).to eq(2*@ramsize)
end
it "ignores non-memory devices" do
- SCR.should_receive(:Read).with(path(".probe.memory")).and_return([@memory, @non_memory])
+ Yast::SCR.should_receive(:Read).with(Yast::Path.new(".probe.memory")).and_return([@memory, @non_memory])
expect(Yast2::HwDetection.memory).to eq(@ramsize)
end
it "raises exception when detection fails" do
- SCR.should_receive(:Read).with(path(".probe.memory")).and_return(nil)
+ Yast::SCR.should_receive(:Read).with(Yast::Path.new(".probe.memory")).and_return(nil)
expect{Yast2::HwDetection.memory}.to raise_error
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/package/yast2.changes new/yast2-3.1.41/package/yast2.changes
--- old/yast2-3.1.37/package/yast2.changes 2014-04-02 11:23:24.000000000 +0200
+++ new/yast2-3.1.41/package/yast2.changes 2014-04-09 12:00:12.000000000 +0200
@@ -1,4 +1,31 @@
-------------------------------------------------------------------
+Wed Apr 9 07:09:37 UTC 2014 - jsrain(a)suse.cz
+
+- added tabs for release notes into slide show dialog (bnc#871158)
+- 3.1.41
+
+-------------------------------------------------------------------
+Wed Apr 9 06:35:54 UTC 2014 - jreidinger(a)suse.com
+
+- save_y2logs: save also log from perl-Bootloader (bnc#872486)
+- 3.1.40
+
+-------------------------------------------------------------------
+Tue Apr 8 15:01:00 CEST 2014 - locilka(a)suse.com
+
+- Changed way of reading the product information: Reads it from
+ /content file if it exists, then from /etc/os-release, then it
+ throws exception if there is no other place to read (bnc#871261)
+- 3.1.39
+
+-------------------------------------------------------------------
+Tue Apr 8 11:40:15 UTC 2014 - lslezak(a)suse.cz
+
+- fixed "uninitialized constant Yast2::HwDetection::SCR" error
+ (bnc#871783), fixed testsuite
+- 3.1.38
+
+-------------------------------------------------------------------
Wed Apr 2 09:18:51 UTC 2014 - jreidinger(a)suse.com
- add control option to enable sshd in installation (bnc#865056)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/package/yast2.spec new/yast2-3.1.41/package/yast2.spec
--- old/yast2-3.1.37/package/yast2.spec 2014-04-02 11:23:24.000000000 +0200
+++ new/yast2-3.1.41/package/yast2.spec 2014-04-09 12:00:12.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2
-Version: 3.1.37
+Version: 3.1.41
Release: 0
URL: https://github.com/yast/yast-yast2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.37/scripts/save_y2logs new/yast2-3.1.41/scripts/save_y2logs
--- old/yast2-3.1.37/scripts/save_y2logs 2014-04-02 11:23:24.000000000 +0200
+++ new/yast2-3.1.41/scripts/save_y2logs 2014-04-09 12:00:12.000000000 +0200
@@ -87,6 +87,10 @@
LIST="$LIST /var/log/pk_backend_zypp"
fi
+if [ -f /var/log/pbl.log ]; then
+ LIST="$LIST /var/log/pbl.log"
+fi
+
RPM_LIST="rpm-qa"
if [ -f /var/lib/rpm/Packages ]; then
rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' 2>/dev/null | sort >/var/log/$RPM_LIST
continue with "q"...
Checked in at Wed Apr 9 17:04:39 CEST 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0