Merge branch 'master' into jse-9101/ux-improvements

yast · Feb 5, 2020 · 67eb255 · 67eb255
2 parents c5abee0 + b9fdf6b
commit 67eb255
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -8,6 +8,18 @@ Wed Feb  5 14:35:00 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
   - Improve feedback when waiting for network I/O.
   - Inform users about unsupported scenarios: unregistered and
     SMT/RMT registered systems.
+- 4.2.33
+
+-------------------------------------------------------------------
+Wed Feb  5 13:50:48 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- Fix running registration in firstboot (bsc#1162841)
+- 4.2.32
+
+-------------------------------------------------------------------
+Tue Feb  4 14:06:59 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- Mark registration as WSL capable module (bsc#1162650)
 - 4.2.31
 
 -------------------------------------------------------------------

diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        4.2.31
+Version:        4.2.32
 Release:        0
 Summary:        YaST2 - Registration Module
 License:        GPL-2.0-only

diff --git a/src/desktop/org.opensuse.yast.SCC.AddExtensions.desktop b/src/desktop/org.opensuse.yast.SCC.AddExtensions.desktop
@@ -7,6 +7,7 @@ X-SuSE-YaST-Argument=select_extensions
 X-SuSE-YaST-RootOnly=yes
 X-SuSE-YaST-Group=Software
 X-SuSE-YaST-Keywords=extensions,modules,software,registration,scc,package,repositories
+X-SuSE-YaST-WSL=true
 
 Icon=yast-addon-extension
 Exec=/usr/bin/xdg-su -c "/sbin/yast2 scc select_extensions"

diff --git a/src/desktop/org.opensuse.yast.SCC.desktop b/src/desktop/org.opensuse.yast.SCC.desktop
@@ -12,6 +12,7 @@ X-SuSE-YaST-AutoInstRequires=lan,proxy
 X-SuSE-YaST-AutoInstSchema=registration.rnc
 X-SuSE-YaST-AutoInstResource=suse_register
 X-SuSE-YaST-Keywords=scc,software,registration,smt,rmt,module,extension
+X-SuSE-YaST-WSL=true
 
 Icon=yast-product-registration
 Exec=/usr/bin/xdg-su -c "/sbin/yast2 scc"

diff --git a/src/lib/registration/ui/base_system_registration_dialog.rb b/src/lib/registration/ui/base_system_registration_dialog.rb
@@ -396,11 +396,19 @@ def show_skipping_warning
       # Convenience method to obtain the medium warning text depending on the
       # medium type
       def medium_warning_text
-        Y2Packager::MediumType.online? ? online_skipping_text : default_skipping_text
+        if Yast::Stage.initial && Y2Packager::MediumType.online?
+          online_skipping_text
+        else
+          default_skipping_text
+        end
       end
 
       def medium_warning_headline
-        Y2Packager::MediumType.online? ? online_skipping_headline : default_skipping_headline
+        if Yast::Stage.initial && Y2Packager::MediumType.online?
+          online_skipping_headline
+        else
+          default_skipping_headline
+        end
       end
 
       def online_skipping_headline
@@ -465,7 +473,7 @@ def network_button
       #
       # @return [Symbol, nil] :skip if not the online medium
       def handle_skipping_registration
-        unless Y2Packager::MediumType.online?
+        if !Yast::Stage.initial || !Y2Packager::MediumType.online?
           log.info "Skipping registration on user request"
           return :skip
         end