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-packager -> sle12 ## BNC# 888566 : "Nobody will find module/extension handling" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-packager/yast2-packager.changes 2014-08-15 16:14:13.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-packager/yast2-packager.changes 2014-08-18 16:19:15.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Aug 18 12:57:01 UTC 2014 - lslezak@suse.cz + +- 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 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-packager - at least 26 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-packager (Old) and /mounts/work_src_done/SLE12/yast2-packager (BS:build ID:42791 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-packager-3.1.41.tar.bz2 New: ---- yast2-packager-3.1.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.eQct37/_old 2014-08-18 16:30:12.000000000 +0200 +++ /var/tmp/diff_new_pack.eQct37/_new 2014-08-18 16:30:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.41 +Version: 3.1.42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.41.tar.bz2 -> yast2-packager-3.1.42.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.41/package/yast2-packager.changes new/yast2-packager-3.1.42/package/yast2-packager.changes --- old/yast2-packager-3.1.41/package/yast2-packager.changes 2014-08-15 13:29:48.000000000 +0200 +++ new/yast2-packager-3.1.42/package/yast2-packager.changes 2014-08-18 16:14:49.000000000 +0200 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Aug 18 12:57:01 UTC 2014 - lslezak@suse.cz + +- 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 - lslezak@suse.cz - better help text: user can confirm product removal and continue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.41/package/yast2-packager.spec new/yast2-packager-3.1.42/package/yast2-packager.spec --- old/yast2-packager-3.1.41/package/yast2-packager.spec 2014-08-15 13:29:48.000000000 +0200 +++ new/yast2-packager-3.1.42/package/yast2-packager.spec 2014-08-18 16:14:49.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.41 +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.41/src/include/packager/repositories_include.rb new/yast2-packager-3.1.42/src/include/packager/repositories_include.rb --- old/yast2-packager-3.1.41/src/include/packager/repositories_include.rb 2014-08-15 13:29:48.000000000 +0200 +++ new/yast2-packager-3.1.42/src/include/packager/repositories_include.rb 2014-08-18 16:14:50.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.41/src/modules/SourceDialogs.rb new/yast2-packager-3.1.42/src/modules/SourceDialogs.rb --- old/yast2-packager-3.1.41/src/modules/SourceDialogs.rb 2014-08-15 13:29:49.000000000 +0200 +++ new/yast2-packager-3.1.42/src/modules/SourceDialogs.rb 2014-08-18 16:14:50.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,7 +32,7 @@ # radio button :comm_repos => N_("Commun&ity Repositories"), # radio button - :scc_repos => N_("&Extensions and Modules from Registration Server..."), + :sccrepos => N_("&Extensions and Modules from Registration Server..."), # radio button :specify_url => N_("Specify &URL..."), # radio button @@ -1964,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( @@ -1984,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), @@ -2161,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 @@ -2200,6 +2210,7 @@ :specify_url, :slp, :local_iso, + :sccrepos, :comm_repos ], selected @@ -2234,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) @@ -2274,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 continue with "q"... Checked in at Mon Aug 18 16:30:21 CEST 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