Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2014-08-20 17:54:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-08-07 08:07:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2014-08-20 17:54:21.000000000 +0200 @@ -1,0 +2,24 @@ +Mon Aug 18 12:57:01 UTC 2014 - [email protected] + +- fixed adding of new SLP and CD/DVD repositories +- added "Repositories from Registration Server" option to URL + selection dialog (displyed when adding a new repository) + (bnc#888566) +- 3.1.42 + +------------------------------------------------------------------- +Fri Aug 15 09:05:01 UTC 2014 - [email protected] + +- better help text: user can confirm product removal and continue + with the product upgrade (bnc#889749) +- 3.1.41 + +------------------------------------------------------------------- +Wed Aug 13 17:21:11 CEST 2014 - [email protected] + +- Removed caching of already accepted licenses: if there is + a license that needs to be accepted, user has to accept it + (bnc#890968) +- 3.1.40 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.39.tar.bz2 New: ---- yast2-packager-3.1.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.QP9CMN/_old 2014-08-20 17:54:23.000000000 +0200 +++ /var/tmp/diff_new_pack.QP9CMN/_new 2014-08-20 17:54:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.39 +Version: 3.1.42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.39.tar.bz2 -> yast2-packager-3.1.42.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.39/package/yast2-packager.changes new/yast2-packager-3.1.42/package/yast2-packager.changes --- old/yast2-packager-3.1.39/package/yast2-packager.changes 2014-08-06 15:13:47.000000000 +0200 +++ new/yast2-packager-3.1.42/package/yast2-packager.changes 2014-08-18 16:14:14.000000000 +0200 @@ -1,4 +1,28 @@ ------------------------------------------------------------------- +Mon Aug 18 12:57:01 UTC 2014 - [email protected] + +- fixed adding of new SLP and CD/DVD repositories +- added "Repositories from Registration Server" option to URL + selection dialog (displyed when adding a new repository) + (bnc#888566) +- 3.1.42 + +------------------------------------------------------------------- +Fri Aug 15 09:05:01 UTC 2014 - [email protected] + +- better help text: user can confirm product removal and continue + with the product upgrade (bnc#889749) +- 3.1.41 + +------------------------------------------------------------------- +Wed Aug 13 17:21:11 CEST 2014 - [email protected] + +- Removed caching of already accepted licenses: if there is + a license that needs to be accepted, user has to accept it + (bnc#890968) +- 3.1.40 + +------------------------------------------------------------------- Wed Aug 6 13:31:31 CEST 2014 - [email protected] - Cleanup in license dialog handling, especially in handling while diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.39/package/yast2-packager.spec new/yast2-packager-3.1.42/package/yast2-packager.spec --- old/yast2-packager-3.1.39/package/yast2-packager.spec 2014-08-06 15:13:47.000000000 +0200 +++ new/yast2-packager-3.1.42/package/yast2-packager.spec 2014-08-18 16:14:14.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.39 +Version: 3.1.42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.39/src/include/packager/repositories_include.rb new/yast2-packager-3.1.42/src/include/packager/repositories_include.rb --- old/yast2-packager-3.1.39/src/include/packager/repositories_include.rb 2014-08-06 15:13:47.000000000 +0200 +++ new/yast2-packager-3.1.42/src/include/packager/repositories_include.rb 2014-08-18 16:14:14.000000000 +0200 @@ -451,6 +451,11 @@ else return :next end + elsif url == "sccrepos://" + sccrepos = WFM.call("inst_scc", ["select_extensions"]) + Builtins.y2milestone("Registration Repositories returned: %1", sccrepos) + + return (sccrepos == :abort || sccrepos == :cancel) ? :back : :next end ret = createSource(url, plaindir, @download_meta, name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.39/src/modules/Packages.rb new/yast2-packager-3.1.42/src/modules/Packages.rb --- old/yast2-packager-3.1.39/src/modules/Packages.rb 2014-08-06 15:13:47.000000000 +0200 +++ new/yast2-packager-3.1.42/src/modules/Packages.rb 2014-08-18 16:14:14.000000000 +0200 @@ -747,13 +747,15 @@ # cannot be started. return { "warning_level" => :blocker, - # update proposal warning + # TRANSLATORS: update proposal warning, do NOT translate "-release", + # it is part of a package name (like "sles-release") "warning" => _( "<ul><li><b>Some products are marked for automatic removal.</b></li>\n" \ "<ul><li>Contact the vendor of the removed add-on to provide you with a new\n" \ "installation media</li><li>Or select the appropriate online extension or module\n" \ - "in the registration step</li><li>Or resolve the conflicts manually in the \n" \ - "package management</li></ul></li></ul>") + "in the registration step</li><li>Or to continue with product upgrade go to the\n" \ + "software selection and mark the product (the -release package) for removal.\n" \ + "</li></ul></li></ul>") } end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.39/src/modules/ProductLicense.rb new/yast2-packager-3.1.42/src/modules/ProductLicense.rb --- old/yast2-packager-3.1.39/src/modules/ProductLicense.rb 2014-08-06 15:13:47.000000000 +0200 +++ new/yast2-packager-3.1.42/src/modules/ProductLicense.rb 2014-08-18 16:14:14.000000000 +0200 @@ -40,9 +40,6 @@ textdomain "packager" - # list of already accepted licenses - @already_accepted_licenses = [] - @license_patterns = [ "license\\.html", "license\\.%1\\.html", @@ -105,40 +102,6 @@ Ops.get(tmp, 0, "") end - # Creates a unique identification from filename - # (MD5sum + file size) - # - # @param [String] filename - # @return [String] unique ID - def GetLicenseIdentString(filename) - if !FileUtils.Exists(filename) - Builtins.y2error("License '%1' doesn't exist", filename) - return nil - end - - filemd5 = FileUtils.MD5sum(filename) - return nil if filemd5 == nil - - ret = Builtins.sformat("%1-%2", filemd5, FileUtils.GetSize(filename)) - - Builtins.y2milestone("License ident for '%1' is '%2'", filename, ret) - - ret - end - - # Checks whether the license (file) has been already accepted - # - # @param string filename - # @return [Boolean] whether the license has been accepted before - def IsLicenseAlreadyAccepted(license_ident) - if license_ident == nil || license_ident == "" - Builtins.y2error("Wrong license ID '%1'", license_ident) - return false - end - - Builtins.contains(@already_accepted_licenses, license_ident) - end - # Sets that the license (file) has been already accepted # # @param string filename @@ -148,15 +111,6 @@ return end - Builtins.y2milestone( - "Adding License ID '%1' as already accepted", - license_ident - ) - @already_accepted_licenses = Builtins.add( - @already_accepted_licenses, - license_ident - ) - nil end @@ -934,25 +888,7 @@ licenses.value = licenses_ref.value; _WhichLicenceFile_result ) - license_ident.value = GetLicenseIdentString(base_license) - - # agreement might be required even if license has been already accepted - # defined, properly ($md5sum(32)-(1)$size(1..n)) - # - # see also BNC #448598 - # Even if it it shown it sometimes doesn't need to be even accepted by - # selecting "yes, I agree" - if require_agreement != true && - Builtins.tostring(license_ident.value) != nil && - Ops.greater_than(Builtins.size(license_ident.value), 33) && - IsLicenseAlreadyAccepted(license_ident.value) - Builtins.y2milestone("License has been already accepted/shown") - - CleanUpLicense(@tmpdir) - return :accepted - else - Builtins.y2milestone("License needs to be shown") - end + log.info "License needs to be shown" # bugzilla #303922 # src_id == nil (the initial product license) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.39/src/modules/SourceDialogs.rb new/yast2-packager-3.1.42/src/modules/SourceDialogs.rb --- old/yast2-packager-3.1.39/src/modules/SourceDialogs.rb 2014-08-06 15:13:47.000000000 +0200 +++ new/yast2-packager-3.1.42/src/modules/SourceDialogs.rb 2014-08-18 16:14:14.000000000 +0200 @@ -18,6 +18,7 @@ class SourceDialogsClass < Module # to use N_ in the class constant extend Yast::I18n + include Yast::Logger # display a global enable/disable checkbox in URL type dialog attr_accessor :display_addon_checkbox @@ -31,6 +32,8 @@ # radio button :comm_repos => N_("Commun&ity Repositories"), # radio button + :sccrepos => N_("&Extensions and Modules from Registration Server..."), + # radio button :specify_url => N_("Specify &URL..."), # radio button :ftp => N_("&FTP..."), @@ -1962,6 +1965,13 @@ @display_addon_checkbox ? HSpacing(3) : Empty() end + def scc_repos_widget + display_scc = WFM.ClientExists("inst_scc") && !Stage.initial + log.info "Displaying SCC option: #{display_scc}" + + display_scc ? Left(RadioButton(Id(:sccrepos), _(WIDGET_LABELS[:sccrepos]))) : Empty() + end + # FIXME: two almost same definitions in the same function smell bad def SelectRadioWidgetOpt(download_widget) contents = HBox( @@ -1982,6 +1992,7 @@ # radio button Left(RadioButton(Id(:comm_repos), _(WIDGET_LABELS[:comm_repos]))) : Empty(), + scc_repos_widget, VSpacing(0.4), Left(RadioButton(Id(:specify_url), _(WIDGET_LABELS[:specify_url]))), VSpacing(0.4), @@ -2159,17 +2170,18 @@ when :back # reset the preselected URL when going back @_url = "" - when :next, :ok return nil when :add_addon RefreshTypeWidgets() return nil end + return nil if event["ID"] != :next && event["ID"] != :ok + # TODO: disable "download" option when CD or DVD source is selected selected = UI.QueryWidget(Id(:type), :CurrentButton) - return :finish if [:slp, :cd, :dvd, :comm_repos].include?(selected) + return :finish if [:slp, :cd, :dvd, :comm_repos, :sccrepos].include?(selected) nil end @@ -2198,6 +2210,7 @@ :specify_url, :slp, :local_iso, + :sccrepos, :comm_repos ], selected @@ -2232,6 +2245,8 @@ @_url = "slp://" elsif selected == :comm_repos @_url = "commrepos://" + elsif selected == :sccrepos + @_url = "sccrepos://" end else Builtins.y2error("Unexpected repo type %1", selected) @@ -2272,6 +2287,8 @@ current = :slp elsif @_url == "commrepos://" current = :comm_repos + elsif @_url == "sccrepos://" + current = :sccrepos else Builtins.y2warning("Unknown URL scheme '%1'", @_url) current = :specify_url -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
