[yast-commit] [ci_new_pac] JFYI yast2-installation -> sle12
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# 868175 : "Error messages when calling 'yast.ssh'" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes 2014-03-14 11:50:52.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes 2014-03-17 09:43:14.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Mar 14 14:43:06 CET 2014 - snwint@suse.de + +- set LIBGL_ALWAYS_INDIRECT in ssh mode (bnc #868175) +- enable yast theme in ssh mode +- 3.1.56 + +------------------------------------------------------------------- +Fri Mar 14 08:15:01 UTC 2014 - jsrain@suse.cz + +- download on-line version of release notes (fate#314695) +- 3.1.55 + +------------------------------------------------------------------- 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:34444 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-installation-3.1.54.tar.bz2 New: ---- yast2-installation-3.1.56.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.sYBJlV/_old 2014-03-17 12:25:17.000000000 +0100 +++ /var/tmp/diff_new_pack.sYBJlV/_new 2014-03-17 12:25:17.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.54 +Version: 3.1.56 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.54.tar.bz2 -> yast2-installation-3.1.56.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.54/package/yast2-installation.changes new/yast2-installation-3.1.56/package/yast2-installation.changes --- old/yast2-installation-3.1.54/package/yast2-installation.changes 2014-03-13 14:24:33.000000000 +0100 +++ new/yast2-installation-3.1.56/package/yast2-installation.changes 2014-03-17 09:40:10.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Mar 14 14:43:06 CET 2014 - snwint@suse.de + +- set LIBGL_ALWAYS_INDIRECT in ssh mode (bnc #868175) +- enable yast theme in ssh mode +- 3.1.56 + +------------------------------------------------------------------- +Fri Mar 14 08:15:01 UTC 2014 - jsrain@suse.cz + +- download on-line version of release notes (fate#314695) +- 3.1.55 + +------------------------------------------------------------------- Thu Mar 13 09:46:18 UTC 2014 - jreidinger@suse.com - add kernel parameters for s390 when cio_ignore enabled to never diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.54/package/yast2-installation.spec new/yast2-installation-3.1.56/package/yast2-installation.spec --- old/yast2-installation-3.1.54/package/yast2-installation.spec 2014-03-13 14:24:33.000000000 +0100 +++ new/yast2-installation-3.1.56/package/yast2-installation.spec 2014-03-17 09:40:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.54 +Version: 3.1.56 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.54/src/clients/inst_download_release_notes.rb new/yast2-installation-3.1.56/src/clients/inst_download_release_notes.rb --- old/yast2-installation-3.1.54/src/clients/inst_download_release_notes.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.56/src/clients/inst_download_release_notes.rb 2014-03-17 09:40:10.000000000 +0100 @@ -0,0 +1,129 @@ +# encoding: utf-8 + +# ------------------------------------------------------------------------------ +# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. +# +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, you may find +# current contact information at www.novell.com. +# ------------------------------------------------------------------------------ + +# +# Authors: Jiri Srain <jsrain@suse.cz> +# +# Purpose: Downloads on-line release notes +# +# $Id$ +module Yast + class InstDownloadReleaseNotesClient < Client + Yast.import "UI" + Yast.import "Product" + Yast.import "Language" + Yast.import "Proxy" + Yast.import "Directory" + Yast.import "InstData" + + include Yast::Logger + + # Download all release notes mentioned in Product::relnotesurl_all + # + # @return true when successful + def download_release_notes + + filename_templ = UI.TextMode ? "/RELEASE-NOTES.%1.txt" : "/RELEASE-NOTES.%1.rtf" + + # Get proxy settings (if any) + proxy = "" + # proxy should be set by inst_install_inf if set via Linuxrc + Proxy.Read + # Test if proxy works + if Proxy.enabled + #it is enough to test http proxy, release notes are downloaded via http + proxy_ret = Proxy.RunTestProxy( + Proxy.http, + "", + "", + Proxy.user, + Proxy.pass + ) + + if Ops.get_boolean(proxy_ret, ["HTTP", "tested"], true) == true && + Ops.get_integer(proxy_ret, ["HTTP", "exit"], 1) == 0 + user_pass = Proxy.user != "" ? + Ops.add(Ops.add(Proxy.user, ":"), Proxy.pass) : + "" + proxy = "--proxy #{Proxy.http}" + proxy << " --proxy-user '#{user_pass}'" unless user_pass.empty? + end + end + + products = Pkg.ResolvableDependencies("", :product, "").select { | product | + product["status"] == :selected || product["status"] == :installed + } + log.info("Products: #{products}") + products.each do | product | + url = product["relnotes_url"] + log.info("URL: #{url}") + # protect from wrong urls + if url == nil || url == "" + log.warning("Skipping invalid URL") + next + end + pos = url.rindex("/") + if pos == nil + log.error ("Broken URL for release notes: #{url}") + next + end + url_base = url[0, pos] + url_template = url_base + filename_templ + log.info("URL template: #{url_base}"); + [Language.language, Language.language[0..1], "en"].each do | lang | + url = Builtins.sformat(url_template, lang) + log.info("URL: #{url}"); + # Where we want to store the downloaded release notes + filename = Builtins.sformat("%1/relnotes", + SCR.Read(path(".target.tmpdir"))) + # download release notes now + cmd = Builtins.sformat( + "/usr/bin/curl --location --verbose --fail --max-time 300 %1 '%2' --output '%3' > '%4/%5' 2>&1", + proxy, + url, + String.Quote(filename), + String.Quote(Directory.logdir), + "curl_log" + ) + ret = SCR.Execute(path(".target.bash"), cmd) + log.info("Downloading release notes: #{cmd} returned #{ret}") + if ret == 0 + log.info("Release notes downloaded successfully") + InstData.release_notes[product["name"]] = SCR.Read(path(".target.string"), filename) + break + end + end + end + if ! InstData.release_notes.empty? + UI.SetReleaseNotes(InstData.release_notes) + Wizard.ShowReleaseNotesButton(_("Re&lease Notes..."), "rel_notes") + end + true + end + + def main + download_release_notes + :auto + end + end +end + +Yast::InstDownloadReleaseNotesClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.54/src/clients/inst_system_analysis.rb new/yast2-installation-3.1.56/src/clients/inst_system_analysis.rb --- old/yast2-installation-3.1.54/src/clients/inst_system_analysis.rb 2014-03-13 14:24:33.000000000 +0100 +++ new/yast2-installation-3.1.56/src/clients/inst_system_analysis.rb 2014-03-17 09:40:10.000000000 +0100 @@ -348,13 +348,16 @@ else @packager_initialized = true Packages.InitializeAddOnProducts - if load_release_notes(Packages.GetBaseSourceID) - # push button - Wizard.ShowReleaseNotesButton(_("Re&lease Notes..."), "rel_notes") - UI::SetReleaseNotes( { Product.name => @media_text } ) + #try on-line release notes first + WFM.CallFunction("inst_download_release_notes") + if InstData.release_notes.empty? + if load_release_notes(Packages.GetBaseSourceID) + # push button + Wizard.ShowReleaseNotesButton(_("Re&lease Notes..."), "rel_notes") + UI::SetReleaseNotes( { Product.name => @media_text } ) + end end - end # reregister callbacks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.54/src/modules/InstData.rb new/yast2-installation-3.1.56/src/modules/InstData.rb --- old/yast2-installation-3.1.54/src/modules/InstData.rb 2014-03-13 14:24:33.000000000 +0100 +++ new/yast2-installation-3.1.56/src/modules/InstData.rb 2014-03-17 09:40:10.000000000 +0100 @@ -93,6 +93,9 @@ # disk to use for OEM image @image_target_disk = nil + # downloaded release notes, product => text + @release_notes = {} + # EOF end @@ -110,6 +113,7 @@ publish :variable => :copy_files_use_control_file, :type => "boolean" publish :variable => :additional_copy_files, :type => "list <map>" publish :variable => :image_target_disk, :type => "string" + publish :variable => :release_notes, :type => "map<string,string>" end InstData = InstDataClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.54/startup/YaST2.call new/yast2-installation-3.1.56/startup/YaST2.call --- old/yast2-installation-3.1.54/startup/YaST2.call 2014-03-13 14:24:33.000000000 +0100 +++ new/yast2-installation-3.1.56/startup/YaST2.call 2014-03-17 09:40:10.000000000 +0100 @@ -139,6 +139,8 @@ # : export Y2STYLE="installation_slim" + export LIBGL_ALWAYS_INDIRECT=1 + set_inst_qt_env } #----[ prepare_for_vnc ]----# continue with "q"... Checked in at Mon Mar 17 12:25:37 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ro