Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2020-01-30 09:40:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on" Thu Jan 30 09:40:42 2020 rev:104 rq:767938 version:4.2.15 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2019-12-14 12:04:02.443397130 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new.26092/yast2-add-on.changes 2020-01-30 09:41:30.429493520 +0100 @@ -1,0 +2,14 @@ +Tue Jan 28 09:30:52 CET 2020 - [email protected] + +- Fix in installation workflow: Can go back from + "Available Extensions and Modules" to registration (bsc#1160501). +- 4.2.15 + +------------------------------------------------------------------- +Mon Jan 27 13:41:41 UTC 2020 - Josef Reidinger <[email protected]> + +- Drop fake CLI that opens GUI and suggest to use zypper or + SUSEConnect instead (bsc#1149900) +- 4.2.14 + +------------------------------------------------------------------- Old: ---- yast2-add-on-4.2.13.tar.bz2 New: ---- yast2-add-on-4.2.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.olyiJY/_old 2020-01-30 09:41:31.081493869 +0100 +++ /var/tmp/diff_new_pack.olyiJY/_new 2020-01-30 09:41:31.085493871 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-add-on # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX 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-add-on -Version: 4.2.13 +Version: 4.2.15 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0-only ++++++ yast2-add-on-4.2.13.tar.bz2 -> yast2-add-on-4.2.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.2.13/package/yast2-add-on.changes new/yast2-add-on-4.2.15/package/yast2-add-on.changes --- old/yast2-add-on-4.2.13/package/yast2-add-on.changes 2019-12-09 10:57:42.000000000 +0100 +++ new/yast2-add-on-4.2.15/package/yast2-add-on.changes 2020-01-28 09:54:37.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Jan 28 09:30:52 CET 2020 - [email protected] + +- Fix in installation workflow: Can go back from + "Available Extensions and Modules" to registration (bsc#1160501). +- 4.2.15 + +------------------------------------------------------------------- +Mon Jan 27 13:41:41 UTC 2020 - Josef Reidinger <[email protected]> + +- Drop fake CLI that opens GUI and suggest to use zypper or + SUSEConnect instead (bsc#1149900) +- 4.2.14 + +------------------------------------------------------------------- Fri Dec 6 13:50:38 CET 2019 - [email protected] - Added needed requriments to vendor.rb (bsc#1158436). @@ -23,7 +37,7 @@ - Using Y2Packager::Resolvable.any? and Y2Packager::Resolvable.find in order to decrease the required memory (bsc#1132650, bsc#1140037). -- 4.2.10 +- 4.2.10 ------------------------------------------------------------------- Thu Nov 21 12:36:10 UTC 2019 - David Diaz <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.2.13/package/yast2-add-on.spec new/yast2-add-on-4.2.15/package/yast2-add-on.spec --- old/yast2-add-on-4.2.13/package/yast2-add-on.spec 2019-12-09 10:57:42.000000000 +0100 +++ new/yast2-add-on-4.2.15/package/yast2-add-on.spec 2020-01-28 09:54:37.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 4.2.13 +Version: 4.2.15 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.2.13/src/clients/add-on.rb new/yast2-add-on-4.2.15/src/clients/add-on.rb --- old/yast2-add-on-4.2.13/src/clients/add-on.rb 2019-12-09 10:57:42.000000000 +0100 +++ new/yast2-add-on-4.2.15/src/clients/add-on.rb 2020-01-28 09:54:37.000000000 +0100 @@ -22,82 +22,24 @@ Yast.import "Mode" Yast.import "CommandLine" Yast.import "Directory" - Yast.import "XML" Yast.include self, "add-on/add-on-workflow.rb" - - @wfm_args = WFM.Args - Builtins.y2milestone("ARGS: %1", @wfm_args) - - @commands = CommandLine.Parse(@wfm_args) - Builtins.y2debug("Commands: %1", @commands) - - # bnc #430852 - if Ops.get_string(@commands, "command", "") == "help" || - Ops.get_string(@commands, "command", "") == "longhelp" - Mode.SetUI("commandline") - # TRANSLATORS: commandline help - CommandLine.Print( + CommandLine.Run( + "id" => "add_on", + # Command line help text for the repository module, %1 is "zypper" + "help" => format( _( - "\n" + - "Add-on Module Help\n" + - "------------------\n" + - "\n" + - "To add a new add-on product via the command-line, use this syntax:\n" + - " /sbin/yast2 add-on URL\n" + - "URL is the path to the add-on source.\n" + - "\n" + - "Examples of URL:\n" + - "http://server.name/directory/Lang-AddOn-10.2-i386/\n"; + - "ftp://server.name/directory/Lang-AddOn-10.2-i386/\n"; + - "nfs://server.name/directory/SDK1-SLE-i386/\n" + - "disk://dev/sda5/directory/Product/CD1/\n" + - "cd://\n" + - "dvd://\n" - ) - ) - return :auto - elsif Ops.get_string(@commands, "command", "") == "xmlhelp" - Mode.SetUI("commandline") - if !Builtins.haskey(Ops.get_map(@commands, "options", {}), "xmlfile") - CommandLine.Print( - _( - "Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option." - ) - ) - return :auto - else - @doc = {} - - Ops.set( - @doc, - "listEntries", - { - "commands" => "command", - "options" => "option", - "examples" => "example" - } - ) - Ops.set( - @doc, - "systemID", - Ops.add(Directory.schemadir, "/commandline.dtd") - ) - Ops.set(@doc, "typeNamespace", "http://www.suse.com/1.0/configns";) - Ops.set(@doc, "rootElement", "commandline") - XML.xmlCreateDoc(:xmlhelp, @doc) - - @exportmap = { "module" => "add-on" } - XML.YCPToXMLFile( - :xmlhelp, - @exportmap, - Ops.get_string(@commands, ["options", "xmlfile"], "") - ) - Builtins.y2milestone("exported XML map: %1", @exportmap) - return :auto - end - end + "Add On Management - This module does not support the command line " \ + "interface, use '%{zypper}' instead for adding a new repository or " \ + "'%{SUSEConnect}' to register a new add-on." + ), + { zypper: "zypper", SUSEConnect: "SUSEConnect" } + ), + "guihandler" => fun_ref(method(:run_GUI), "symbol ()") + ) + end + def run_GUI Wizard.CreateDialog Wizard.SetContents( @@ -134,28 +76,12 @@ # Initialize current sources Read() - @ret = nil - # <-- Initialization finish Wizard.EnableAbortButton Wizard.EnableNextButton - if Builtins.size(WFM.Args) == 0 - Builtins.y2milestone( - "Url not specified in cmdline, starting full-featured module" - ) - @ret = RunAddOnsOverviewDialog() - else - @url = Convert.to_string(WFM.Args(0)) - Builtins.y2milestone("Specified URL %1", @url) - begin - @createResult = SourceManager.createSource(@url) - Builtins.y2milestone("Source creating result: %1", @createResult) - end while @createResult == :again - AddOnProduct.last_ret = :next - @ret = RunAutorunWizard() - end + ret = RunAddOnsOverviewDialog() Pkg.SourceSaveAll if @ret == :next @@ -165,9 +91,7 @@ Pkg.SourceReleaseAll UI.CloseDialog - @ret - - # EOF + ret end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.2.13/src/include/add-on/add-on-workflow.rb new/yast2-add-on-4.2.15/src/include/add-on/add-on-workflow.rb --- old/yast2-add-on-4.2.13/src/include/add-on/add-on-workflow.rb 2019-12-09 10:57:42.000000000 +0100 +++ new/yast2-add-on-4.2.15/src/include/add-on/add-on-workflow.rb 2020-01-28 09:54:37.000000000 +0100 @@ -114,11 +114,11 @@ # @return [Symbol] for wizard sequencer def MediaSelect aliases = { - "type" => lambda { media_type_selection }, + # true: Skip "type" if it comes from :back and call registartion instead. + # bsc#1160501 + "type" => [lambda { media_type_selection }, true ], "edit" => lambda { EditDialog() }, - "store" => lambda do - StoreSource() - end + "store" => lambda { StoreSource() } } sources_before = Pkg.SourceGetCurrent(false)
