Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2016-04-11 09:12:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2016-03-26 15:11:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2016-04-11 09:12:44.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Apr 6 09:57:59 UTC 2016 - [email protected] + +- Explicitly resolve shortcut conflicts proposing 'alt-w' for + [Network Configuration]. (bsc#974216) +- 3.1.94 + +------------------------------------------------------------------- +Mon Apr 4 09:15:27 CEST 2016 - [email protected] + +- Using "uptime" from package yast2 instead of Builtins.time. + Cleanup for bnc#956730. +- 3.1.93 + +------------------------------------------------------------------- + +Fri Apr 1 12:37:51 UTC 2016 - [email protected] + +- Added [Network Configuration] button to Source Dialog for + installation or upgrade modes. (fate#319716) +- 3.1.92 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.91.tar.bz2 New: ---- yast2-packager-3.1.94.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.ehNRay/_old 2016-04-11 09:12:45.000000000 +0200 +++ /var/tmp/diff_new_pack.ehNRay/_new 2016-04-11 09:12:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.91 +Version: 3.1.94 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,8 +33,8 @@ BuildRequires: yast2_theme BuildRequires: rubygem(rspec) -# PackagesUI.show_update_messages -BuildRequires: yast2 >= 3.1.175 +# PackagesUI.show_update_messages; uptime call +BuildRequires: yast2 >= 3.1.182 # Pkg::SourceRawURL() and Pkg:ExpandedUrl() BuildRequires: yast2-pkg-bindings >= 3.1.30 @@ -45,8 +45,8 @@ # Pkg::SourceRawURL() and Pkg:ExpandedUrl() Requires: yast2-pkg-bindings >= 3.1.30 -# Fixed .proc.cmdline agent -Requires: yast2 >= 3.1.89 +# Fixed .proc.cmdline agent; uptime call +Requires: yast2 >= 3.1.182 # unzipping license file Requires: unzip ++++++ yast2-packager-3.1.91.tar.bz2 -> yast2-packager-3.1.94.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.91/package/yast2-packager.changes new/yast2-packager-3.1.94/package/yast2-packager.changes --- old/yast2-packager-3.1.91/package/yast2-packager.changes 2016-03-18 13:22:11.000000000 +0100 +++ new/yast2-packager-3.1.94/package/yast2-packager.changes 2016-04-06 14:52:57.000000000 +0200 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Wed Apr 6 09:57:59 UTC 2016 - [email protected] + +- Explicitly resolve shortcut conflicts proposing 'alt-w' for + [Network Configuration]. (bsc#974216) +- 3.1.94 + +------------------------------------------------------------------- +Mon Apr 4 09:15:27 CEST 2016 - [email protected] + +- Using "uptime" from package yast2 instead of Builtins.time. + Cleanup for bnc#956730. +- 3.1.93 + +------------------------------------------------------------------- + +Fri Apr 1 12:37:51 UTC 2016 - [email protected] + +- Added [Network Configuration] button to Source Dialog for + installation or upgrade modes. (fate#319716) +- 3.1.92 + +------------------------------------------------------------------- Fri Mar 18 11:46:53 UTC 2016 - [email protected] - Fixed list of skipped packages in the installation summary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.91/package/yast2-packager.spec new/yast2-packager-3.1.94/package/yast2-packager.spec --- old/yast2-packager-3.1.91/package/yast2-packager.spec 2016-03-18 13:22:11.000000000 +0100 +++ new/yast2-packager-3.1.94/package/yast2-packager.spec 2016-04-06 14:52:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.91 +Version: 3.1.94 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,8 +32,8 @@ BuildRequires: yast2_theme BuildRequires: rubygem(rspec) -# PackagesUI.show_update_messages -BuildRequires: yast2 >= 3.1.175 +# PackagesUI.show_update_messages; uptime call +BuildRequires: yast2 >= 3.1.182 # Pkg::SourceRawURL() and Pkg:ExpandedUrl() BuildRequires: yast2-pkg-bindings >= 3.1.30 @@ -44,8 +44,8 @@ # Pkg::SourceRawURL() and Pkg:ExpandedUrl() Requires: yast2-pkg-bindings >= 3.1.30 -# Fixed .proc.cmdline agent -Requires: yast2 >= 3.1.89 +# Fixed .proc.cmdline agent; uptime call +Requires: yast2 >= 3.1.182 # unzipping license file Requires: unzip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.91/src/clients/inst_kickoff.rb new/yast2-packager-3.1.94/src/clients/inst_kickoff.rb --- old/yast2-packager-3.1.91/src/clients/inst_kickoff.rb 2016-03-18 13:22:11.000000000 +0100 +++ new/yast2-packager-3.1.94/src/clients/inst_kickoff.rb 2016-04-06 14:52:57.000000000 +0200 @@ -400,7 +400,7 @@ end # timestamp - date = Builtins.timestring("%Y%m%d", Builtins.time, false) + date = Builtins.timestring("%Y%m%d", ::Time.now.to_i, false) if true Builtins.y2milestone("Creating backup of %1", Directory.logdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.91/src/include/packager/key_manager_dialogs.rb new/yast2-packager-3.1.94/src/include/packager/key_manager_dialogs.rb --- old/yast2-packager-3.1.91/src/include/packager/key_manager_dialogs.rb 2016-03-18 13:22:11.000000000 +0100 +++ new/yast2-packager-3.1.94/src/include/packager/key_manager_dialogs.rb 2016-04-06 14:52:57.000000000 +0200 @@ -64,7 +64,7 @@ ) expires = Ops.get_integer(key, "expires_raw", 0) exp_str = Ops.greater_than(expires, 0) && - Ops.greater_than(Builtins.time, expires) ? + ::Time.now.to_i > expires ? # %1 is the date when the GPG key expired (e.g. '10.6.2005'), display the date in red Builtins.sformat( _("Expires: <font color = \"red\">%1</font> (The key is expired.)"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.91/src/modules/PackageInstallation.rb new/yast2-packager-3.1.94/src/modules/PackageInstallation.rb --- old/yast2-packager-3.1.91/src/modules/PackageInstallation.rb 2016-03-18 13:22:11.000000000 +0100 +++ new/yast2-packager-3.1.94/src/modules/PackageInstallation.rb 2016-04-06 14:52:58.000000000 +0200 @@ -7,6 +7,7 @@ # $Id$ # require "yast" +require "yast2/system_time" module Yast class PackageInstallationClass < Module @@ -136,7 +137,7 @@ PackageSlideShow.UpdateAllCdProgress(false) SlideShow.StartTimer - start_time = Builtins.time + start_time = Yast2::SystemTime.uptime # returns [ int successful, list failed, list remaining, list srcremaining ] Builtins.y2milestone("Calling Pkg::Commit (%1)", config) @@ -150,7 +151,7 @@ end - installation_time = Ops.subtract(Builtins.time, start_time) + installation_time = Yast2::SystemTime.uptime - start_time Builtins.y2milestone( "Installation took %1 seconds, commit result: %2", installation_time, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.91/src/modules/SourceDialogs.rb new/yast2-packager-3.1.94/src/modules/SourceDialogs.rb --- old/yast2-packager-3.1.91/src/modules/SourceDialogs.rb 2016-03-18 13:22:11.000000000 +0100 +++ new/yast2-packager-3.1.94/src/modules/SourceDialogs.rb 2016-04-06 14:52:58.000000000 +0200 @@ -87,6 +87,7 @@ Yast.import "ProductControl" Yast.import "ProductFeatures" Yast.import "Stage" + Yast.import "WFM" # common functions / data @@ -470,6 +471,7 @@ end true end + # Get widget description map # @return widget description map def RepoNameWidget @@ -1996,7 +1998,7 @@ @display_addon_checkbox ? VBox( Left(CheckBox(Id(:add_addon), Opt(:notify), - _("I would like to install an additional Add On Product"), false)), + _("I would li&ke to install an additional Add On Product"), false)), VSpacing(1), ) : Empty() @@ -2013,6 +2015,14 @@ display_scc ? Left(RadioButton(Id(:sccrepos), _(WIDGET_LABELS[:sccrepos]))) : Empty() end + def network_button + if Mode.installation || Mode.live_installation || Mode.update + Right(PushButton(Id(:network), _("Net&work Configuration..."))) + else + Empty() + end + end + # FIXME: two almost same definitions in the same function smell bad def SelectRadioWidgetOpt(download_widget) contents = HBox( @@ -2215,6 +2225,8 @@ when :add_addon RefreshTypeWidgets() return nil + when :network + Yast::WFM.CallFunction("inst_lan", [{ "skip_detection" => true }]) end return nil if event["ID"] != :next && event["ID"] != :ok @@ -2625,7 +2637,7 @@ { "widget_names" => ["select"], "widget_descr" => Widgets(), - "contents" => VBox("select"), + "contents" => VBox(network_button, "select"), "caption" => caption, "back_button" => Label.BackButton, "next_button" => Label.NextButton, @@ -2649,7 +2661,7 @@ { "widget_names" => ["select_dl"], "widget_descr" => Widgets(), - "contents" => VBox("select_dl"), + "contents" => VBox(network_button, "select_dl"), "caption" => caption, "back_button" => Label.BackButton, "next_button" => Label.NextButton,
