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# 868942 : ""use add-ons from media" checkbox does not work properly" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes 2014-03-17 12:25:36.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes 2014-03-20 10:40:49.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 19 12:45:27 UTC 2014 - lslezak@suse.cz + +- skip "Installation Options" dialog when online repository option + should not be displayed (part of bnc#868942) +- 3.1.57 + +------------------------------------------------------------------- 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:34633 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-installation-3.1.56.tar.bz2 New: ---- yast2-installation-3.1.57.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.rLQGYV/_old 2014-03-21 15:21:17.000000000 +0100 +++ /var/tmp/diff_new_pack.rLQGYV/_new 2014-03-21 15:21:17.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.56 +Version: 3.1.57 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.56.tar.bz2 -> yast2-installation-3.1.57.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.56/package/yast2-installation.changes new/yast2-installation-3.1.57/package/yast2-installation.changes --- old/yast2-installation-3.1.56/package/yast2-installation.changes 2014-03-17 09:40:10.000000000 +0100 +++ new/yast2-installation-3.1.57/package/yast2-installation.changes 2014-03-20 10:37:28.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 19 12:45:27 UTC 2014 - lslezak@suse.cz + +- skip "Installation Options" dialog when online repository option + should not be displayed (part of bnc#868942) +- 3.1.57 + +------------------------------------------------------------------- Fri Mar 14 14:43:06 CET 2014 - snwint@suse.de - set LIBGL_ALWAYS_INDIRECT in ssh mode (bnc #868175) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.56/package/yast2-installation.spec new/yast2-installation-3.1.57/package/yast2-installation.spec --- old/yast2-installation-3.1.56/package/yast2-installation.spec 2014-03-17 09:40:10.000000000 +0100 +++ new/yast2-installation-3.1.57/package/yast2-installation.spec 2014-03-20 10:37:28.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.56 +Version: 3.1.57 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.56/src/clients/inst_installation_options.rb new/yast2-installation-3.1.57/src/clients/inst_installation_options.rb --- old/yast2-installation-3.1.56/src/clients/inst_installation_options.rb 2014-03-17 09:40:10.000000000 +0100 +++ new/yast2-installation-3.1.57/src/clients/inst_installation_options.rb 2014-03-20 10:37:28.000000000 +0100 @@ -1,7 +1,7 @@ # encoding: utf-8 # ------------------------------------------------------------------------------ -# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. +# Copyright (c) 2006-2014 Novell, Inc. All Rights Reserved. # # # This program is free software; you can redistribute it and/or modify it under @@ -21,7 +21,7 @@ # File: clients/inst_installation_options.rb # Package: Installation -# Summary: Initialize installation +# Summary: Initialize installation, set installation options # Authors: Jiri Srain <jsrain@suse.cz> # Lukas Ocilka <locilka@suse.cz> # @@ -34,7 +34,6 @@ textdomain "installation" Yast.import "AddOnProduct" - Yast.import "GetInstArgs" Yast.import "Installation" Yast.import "InstData" Yast.import "Linuxrc" @@ -73,24 +72,26 @@ Installation.productsources_selected = false end + # nothing to display, simply continue + if !@show_online_repositories + SetRequiredPackages() + return :auto + end + Wizard.SetContents( # dialog caption _("Installation Options"), - InstModeDialogContent(:install), - InstModeDialogHelp(), + InstOptionsDialogContent(), + InstOptionsDialogHelp(), true, true ) Wizard.SetTitleIcon("yast-software") - @ret = nil - - @umount_result = Linuxrc.InstallInf("umount_result") - @media = Linuxrc.InstallInf("InstMode") Builtins.y2milestone( "Umount result: %1, inst mode: %2", - @umount_result, - @media + Linuxrc.InstallInf("umount_result"), + Linuxrc.InstallInf("InstMode") ) AdjustStepsAccordingToInstallationSettings() @@ -106,8 +107,6 @@ Builtins.y2milestone("add_on_selected: %1", Installation.add_on_selected) AdjustStepsAccordingToInstallationSettings() end - @ret = nil - next # Use-Community-Repositories status changed elsif @ret == :productsources if UI.WidgetExists(Id(:productsources)) @@ -118,18 +117,11 @@ ) AdjustStepsAccordingToInstallationSettings() end - @ret = nil - next - # Next button - elsif @ret == :next - next # Abort button elsif @ret == :abort if Popup.ConfirmAbort(Stage.initial ? :painless : :incomplete) return :abort end - @ret = nil - next end end until @ret == :back || @ret == :next @@ -171,11 +163,11 @@ @ret = :finish if @ret == :next - @ret + @ret end # see bugzilla #156529 - def InstModeDialogContent(pre_selected) + def InstOptionsDialogContent() HBox( HStretch(), VBox( @@ -204,7 +196,7 @@ ) end - def InstModeDialogHelp + def InstOptionsDialogHelp # help text for installation method _("<p><big><b>Installation Options</b></big></p>") + # help text for installation option continue with "q"... Checked in at Fri Mar 21 15:21:25 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