Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2015-10-25 15:11:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2015-10-20 16:21:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2015-10-25 15:11:04.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Oct 22 08:24:58 UTC 2015 - [email protected] + +- bnc#946047 + - use proper hostname / domain defaults when network is + configured by linuxrc +- 3.1.154 + +------------------------------------------------------------------- +Wed Oct 21 07:29:59 UTC 2015 - [email protected] + +- Replace "Skip" with "Ignore" in the dialog that is shown when + there's a problem during packages installation (bsc#948608) +- 3.1.153 + +------------------------------------------------------------------- Old: ---- yast2-3.1.152.tar.bz2 New: ---- yast2-3.1.154.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.XzEe5j/_old 2015-10-25 15:11:05.000000000 +0100 +++ /var/tmp/diff_new_pack.XzEe5j/_new 2015-10-25 15:11:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.152 +Version: 3.1.154 Release: 0 Url: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.152.tar.bz2 -> yast2-3.1.154.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.152/configure.in.in new/yast2-3.1.154/configure.in.in --- old/yast2-3.1.152/configure.in.in 2015-10-14 15:21:09.000000000 +0200 +++ new/yast2-3.1.154/configure.in.in 2015-10-22 13:51:08.000000000 +0200 @@ -22,6 +22,5 @@ ## and generate the output # also done via makefile -AC_CONFIG_FILES(library/general/src/modules/Version.rb -library/network/src/scrconf/network.scr) +AC_CONFIG_FILES(library/network/src/scrconf/network.scr) @YAST2-OUTPUT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.152/library/general/src/modules/Version.rb.in new/yast2-3.1.154/library/general/src/modules/Version.rb.in --- old/yast2-3.1.152/library/general/src/modules/Version.rb.in 2015-10-14 15:21:09.000000000 +0200 +++ new/yast2-3.1.154/library/general/src/modules/Version.rb.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -# encoding: utf-8 - -# File: modules/Version.ycp -# Package: yast2 -# Summary: yast2 package version -# Authors: Michal Svec <[email protected]> -# -# $Id$ -# -# Version.rb is a <b> -# -# ** GENERATED FILE ** -# -# </b>, so edit Version.rb.in instead. -require "yast" - -module Yast - class VersionClass < Module - def main - # Version of the yast2 package - @yast2 = "@VERSION@" - - # EOF - end - - publish :variable => :yast2, :type => "string" - end - - Version = VersionClass.new - Version.main -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.152/library/packages/src/modules/PackageCallbacks.rb new/yast2-3.1.154/library/packages/src/modules/PackageCallbacks.rb --- old/yast2-3.1.152/library/packages/src/modules/PackageCallbacks.rb 2015-10-14 15:21:09.000000000 +0200 +++ new/yast2-3.1.154/library/packages/src/modules/PackageCallbacks.rb 2015-10-22 13:51:08.000000000 +0200 @@ -253,7 +253,7 @@ button_box = ButtonBox( PushButton(Id(:abort), Opt(:cancelButton, :key_F9), Label.AbortButton), PushButton(Id(:retry), Opt(:customButton), Label.RetryButton), - PushButton(Id(:ignore), Opt(:okButton), Label.SkipButton) + PushButton(Id(:ignore), Opt(:okButton), Label.IgnoreButton) ) if @showLongInfo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.152/library/types/src/modules/Hostname.rb new/yast2-3.1.154/library/types/src/modules/Hostname.rb --- old/yast2-3.1.152/library/types/src/modules/Hostname.rb 2015-10-14 15:21:09.000000000 +0200 +++ new/yast2-3.1.154/library/types/src/modules/Hostname.rb 2015-10-22 13:51:08.000000000 +0200 @@ -38,6 +38,7 @@ Yast.import "IP" Yast.import "String" Yast.import "FileUtils" + Yast.import "Mode" # i18n characters in domain names are still not allowed # @@ -159,7 +160,7 @@ hostname_data = Convert.to_map( SCR.Execute(path(".target.bash_output"), "hostname --fqdn") ) - if hostname_data.nil? || Ops.get_integer(hostname_data, "exit", -1) != 0 + if hostname_data.nil? || hostname_data["exit"] != 0 || invalid_hostname?(hostname_data["stdout"].to_s.strip) fqhostname = if FileUtils.Exists("/etc/hostname") SCR.Read(path(".target.string"), "/etc/hostname") else @@ -236,6 +237,18 @@ publish function: :CurrentFQ, type: "string ()" publish function: :CurrentHostname, type: "string ()" publish function: :CurrentDomain, type: "string ()" + + private + + # It checks if the hostname cannot be used for setting default fqdn + # + # FIXME: Hotfix for bnc#946047. This should be dropped as part of fate#319639 + # implementation + # + # Basicaly, linuxrc sometimes resolves IP when querying "hostname --fqdn" + def invalid_hostname?(hostname) + Mode.installation && IP.Check(hostname) + end end Hostname = HostnameClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.152/package/yast2.changes new/yast2-3.1.154/package/yast2.changes --- old/yast2-3.1.152/package/yast2.changes 2015-10-14 15:21:09.000000000 +0200 +++ new/yast2-3.1.154/package/yast2.changes 2015-10-22 13:51:08.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Thu Oct 22 08:24:58 UTC 2015 - [email protected] + +- bnc#946047 + - use proper hostname / domain defaults when network is + configured by linuxrc +- 3.1.154 + +------------------------------------------------------------------- +Wed Oct 21 07:29:59 UTC 2015 - [email protected] + +- Replace "Skip" with "Ignore" in the dialog that is shown when + there's a problem during packages installation (bsc#948608) +- 3.1.153 + +------------------------------------------------------------------- Thu Oct 8 10:42:07 UTC 2015 - [email protected] - Fix "stack level too deep" exception if cd-rom repository is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.152/package/yast2.spec new/yast2-3.1.154/package/yast2.spec --- old/yast2-3.1.152/package/yast2.spec 2015-10-14 15:21:09.000000000 +0200 +++ new/yast2-3.1.154/package/yast2.spec 2015-10-22 13:51:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.152 +Version: 3.1.154 Release: 0 Url: https://github.com/yast/yast-yast2
