Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory checked
in at 2022-05-09 18:43:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2 (Old)
and /work/SRC/openSUSE:Factory/.yast2.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2"
Mon May 9 18:43:38 2022 rev:531 rq:975449 version:4.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2022-04-09
01:44:03.338730669 +0200
+++ /work/SRC/openSUSE:Factory/.yast2.new.1538/yast2.changes 2022-05-09
18:43:54.696193971 +0200
@@ -1,0 +2,13 @@
+Fri May 6 15:23:06 UTC 2022 - Josef Reidinger <jreidin...@suse.com>
+
+- Avoid build failures when packager is not available (related to
+ bsc#1196674)
+- 4.5.3
+
+-------------------------------------------------------------------
+Tue May 3 14:05:10 UTC 2022 - Stefan Hundhammer <shundham...@suse.com>
+
+- Show what product is being installed (bsc#1196674)
+- 4.5.2
+
+-------------------------------------------------------------------
@@ -11 +24 @@
-- Bump version to 4.5.0 (#bsc1198109)
+- Bump version to 4.5.0 (bsc#1198109)
Old:
----
yast2-4.5.1.tar.bz2
New:
----
yast2-4.5.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.VqDEX5/_old 2022-05-09 18:43:55.456194863 +0200
+++ /var/tmp/diff_new_pack.VqDEX5/_new 2022-05-09 18:43:55.460194868 +0200
@@ -17,7 +17,7 @@
Name: yast2
-Version: 4.5.1
+Version: 4.5.3
Release: 0
Summary: YaST2 Main Package
++++++ yast2-4.5.1.tar.bz2 -> yast2-4.5.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-4.5.1/library/packages/src/modules/SlideShow.rb
new/yast2-4.5.3/library/packages/src/modules/SlideShow.rb
--- old/yast2-4.5.1/library/packages/src/modules/SlideShow.rb 2022-04-07
16:00:08.000000000 +0200
+++ new/yast2-4.5.3/library/packages/src/modules/SlideShow.rb 2022-05-06
17:35:05.000000000 +0200
@@ -105,11 +105,6 @@
class SlideShowClass < Module
include Yast::Logger
- module UI_ID
- TOTAL_PROGRESS = :progressTotal
- CURRENT_PACKAGE = :progressCurrentPackage
- end
-
def main
Yast.import "UI"
@@ -158,18 +153,21 @@
# Start the internal (global) timer.
#
+ # FIXME: Obsolete published method
def StartTimer
nil
end
# Reset the internal (global) timer.
#
+ # FIXME: Obsolete published method
def ResetTimer
nil
end
# Stop the internal (global) timer and account elapsed time.
#
+ # FIXME: Obsolete published method
def StopTimer
nil
end
@@ -184,6 +182,7 @@
# Check if currently the "Slide Show" page is shown
# @return true if showing details, false otherwise
#
+ # FIXME: Obsolete published method
def ShowingSlide
false
end
@@ -202,6 +201,8 @@
# Restart the subprogress of the slideshow. This means the
# label will be set to given text, value to 0.
# @param [String] text new label for the subprogress
+ #
+ # FIXME: Obsolete published method
def SubProgressStart(text); end
# Updates status of the sub-progress in slide show. The new value and label
@@ -210,12 +211,16 @@
#
# @param [Fixnum] value new value for the subprogress
# @param [String] label new label for the subprogress
+ #
+ # FIXME: Obsolete published method
def SubProgress(value, label); end
# Restart the global progress of the slideshow. This means the
# label will be set to given text, value to 0.
#
# @param [String] text new label for the global progress
+ #
+ # FIXME: Obsolete published method
def GlobalProgressStart(text)
UpdateGlobalProgress(0, text)
end
@@ -230,15 +235,15 @@
value ||= @total_progress_value
label ||= @total_progress_label
- if UI.WidgetExists(UI_ID::TOTAL_PROGRESS)
+ if UI.WidgetExists(:progressTotal)
if @total_progress_value != value
@total_progress_value = value
- UI.ChangeWidget(UI_ID::TOTAL_PROGRESS, :Value, value)
+ UI.ChangeWidget(:progressTotal, :Value, value)
end
if @total_progress_label != label
@total_progress_label = label
- UI.ChangeWidget(UI_ID::TOTAL_PROGRESS, :Label, label)
+ UI.ChangeWidget(:progressTotal, :Label, label)
end
else
log.warn "progressTotal widget missing"
@@ -329,6 +334,7 @@
# Check if the slide show is available. This must be called before trying
# to access any slides; some late initialization is done here.
#
+ # FIXME: Obsolete
def CheckForSlides
nil
end
@@ -336,6 +342,7 @@
# Set the slide show text.
# @param [String] text
#
+ # FIXME: Obsolete
def SetSlideText(_text)
nil
end
@@ -351,6 +358,7 @@
# Create one single item for the CD statistics table
#
+ # FIXME: Obsolete published method
def TableItem(id, col1, col2, col3, col4)
Item(Id(id), col1, col2, col3, col4)
end
@@ -358,6 +366,7 @@
# Load a slide image + text.
# @param [Fixnum] slide_no number of slide to load
#
+ # FIXME: Obsolete
def LoadSlide(_slide_no)
nil
end
@@ -365,31 +374,64 @@
# Check if the current slide needs to be changed and do that if
# necessary.
#
+ # FIXME: Obsolete
def ChangeSlideIfNecessary
nil
end
- # widgets for progress bar
- # @return A term describing the widgets
+ # Widgets for the progress bar tab
+ # @return A term describing the widgets
#
def progress_widgets
- HBox(
- Id(:progress_bar),
- HSpacing(1),
+ MarginBox(
+ 4, 1, # hor/vert
VBox(
+ product_name_widgets,
VCenter(
ProgressBar(
- Id(UI_ID::TOTAL_PROGRESS),
+ Id(:progressTotal),
@total_progress_label,
100,
@total_progress_value
)
)
- ),
- HSpacing(0.5)
+ )
)
end
+ # Widgets for the product name
+ # @return A term describing the widgets
+ def product_name_widgets
+ text = product_name
+ return Empty() if text.nil? || text.empty?
+
+ MarginBox(
+ 0, 1, # hor/vert
+ Left(
+ Label(Id(:productName), text)
+ )
+ )
+ end
+
+ # Name of the base product that is or will be installed
+ # @return [String,nil] Display name of the base product
+ def product_name
+ # Avoid expensive operation in the installed system where this will
+ # always return 'nil' anyway.
+ return nil if Mode.normal
+
+ # lazy load product spec as it lives in packager and maybe is not
available
+ require "y2packager/product_spec"
+ product = Y2Packager::ProductSpec.selected_base
+ return nil if product.nil?
+
+ product.display_name
+ rescue LoadError
+ log.info "product spec not available. Probably yast2-packager is missing"
+
+ nil
+ end
+
# Construct widgets describing a page with the real slide show
# (the RichText / HTML page)
#
@@ -413,6 +455,7 @@
# Switch from the 'details' view to the 'slide show' view.
#
+ # FIXME: Obsolete
def SwitchToSlideView
return if ShowingSlide()
@@ -426,12 +469,14 @@
end
# Rebuild the details page.
+ # FIXME: Obsolete
def RebuildDetailsView
nil
end
# Switch from the 'slide show' view to the 'details' view.
#
+ # FIXME: Obsolete
def SwitchToDetailsView
nil
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-4.5.1/library/packages/test/slide_show_test.rb
new/yast2-4.5.3/library/packages/test/slide_show_test.rb
--- old/yast2-4.5.1/library/packages/test/slide_show_test.rb 2022-04-07
16:00:08.000000000 +0200
+++ new/yast2-4.5.3/library/packages/test/slide_show_test.rb 2022-05-06
17:35:05.000000000 +0200
@@ -6,13 +6,33 @@
Yast.import "Slides"
Yast.import "UI"
+# Avoid testing product_name() and the methods that are using it:
+# This will break because we needed to suppress
+#
+# require "y2packager/product_spec"
+#
+# by overloading Kernel::require in ./test_helper.rb to avoid a cyclic
+# dependency between this package and yast2-packager.
+#
+# It will work when running the unit tests locally, but it will break in an
+# autobuild environment ("rake osc:build", "rake osc:sr") which is called in
+# Jenkins because unlike any real-life system using YaST, an AutoBuild
+# environment will NOT install yast2-packager anyway to satisfy other
+# requirements. So this problem is hard to spot.
+#
+# It might be possible to force it to work with some heavy monkey-patching and
+# instance_double, but for the extent of useful testing that it might bring,
+# this is simply not worthwhile.
+#
+# 2022-05-04 shundhammer
+#
describe "Yast::SlideShow" do
before(:each) do
Yast.y2milestone "--------- Running test ---------"
allow(::File).to receive(:exist?).and_return(true)
end
- TOTAL_PROGRESS_ID = Yast::SlideShowClass::UI_ID::TOTAL_PROGRESS
+ TOTAL_PROGRESS_ID = :progressTotal
describe "#UpdateGlobalProgress" do
before(:each) do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-4.5.1/package/yast2.changes
new/yast2-4.5.3/package/yast2.changes
--- old/yast2-4.5.1/package/yast2.changes 2022-04-07 16:00:08.000000000
+0200
+++ new/yast2-4.5.3/package/yast2.changes 2022-05-06 17:35:05.000000000
+0200
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Fri May 6 15:23:06 UTC 2022 - Josef Reidinger <jreidin...@suse.com>
+
+- Avoid build failures when packager is not available (related to
+ bsc#1196674)
+- 4.5.3
+
+-------------------------------------------------------------------
+Tue May 3 14:05:10 UTC 2022 - Stefan Hundhammer <shundham...@suse.com>
+
+- Show what product is being installed (bsc#1196674)
+- 4.5.2
+
+-------------------------------------------------------------------
Thu Apr 7 11:43:15 UTC 2022 - Stefan Hundhammer <shundham...@suse.com>
- Show file conflict checking progress in delayed popup (bsc#1195608)
@@ -8,7 +21,7 @@
-------------------------------------------------------------------
Wed Apr 06 13:24:58 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
-- Bump version to 4.5.0 (#bsc1198109)
+- Bump version to 4.5.0 (bsc#1198109)
-------------------------------------------------------------------
Fri Mar 11 13:05:14 UTC 2022 - Imobach Gonzalez Sosa <igonzalezs...@suse.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-4.5.1/package/yast2.spec
new/yast2-4.5.3/package/yast2.spec
--- old/yast2-4.5.1/package/yast2.spec 2022-04-07 16:00:08.000000000 +0200
+++ new/yast2-4.5.3/package/yast2.spec 2022-05-06 17:35:05.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2
-Version: 4.5.1
+Version: 4.5.3
Release: 0
Summary: YaST2 Main Package
