Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package yast2-registration for 
openSUSE:Factory checked in at 2021-05-05 20:39:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-registration.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-registration"

Wed May  5 20:39:41 2021 rev:72 rq:890055 version:4.4.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes    
2021-04-10 15:26:17.970302383 +0200
+++ 
/work/SRC/openSUSE:Factory/.yast2-registration.new.2988/yast2-registration.changes
  2021-05-05 20:39:44.226984193 +0200
@@ -1,0 +2,7 @@
+Wed Apr 21 11:22:55 UTC 2021 - Imobach Gonzalez Sosa <igonzalezs...@suse.com>
+
+- AutoYaST: do not crash when cloning a registered system with
+  no registration code (bsc#1184216).
+- 4.4.1
+
+-------------------------------------------------------------------

Old:
----
  yast2-registration-4.4.0.tar.bz2

New:
----
  yast2-registration-4.4.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.ZFo5if/_old  2021-05-05 20:39:44.750981944 +0200
+++ /var/tmp/diff_new_pack.ZFo5if/_new  2021-05-05 20:39:44.754981927 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        4.4.0
+Version:        4.4.1
 Release:        0
 Summary:        YaST2 - Registration Module
 License:        GPL-2.0-only

++++++ yast2-registration-4.4.0.tar.bz2 -> yast2-registration-4.4.1.tar.bz2 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-registration-4.4.0/package/yast2-registration.changes 
new/yast2-registration-4.4.1/package/yast2-registration.changes
--- old/yast2-registration-4.4.0/package/yast2-registration.changes     
2021-04-07 16:58:07.000000000 +0200
+++ new/yast2-registration-4.4.1/package/yast2-registration.changes     
2021-05-03 16:35:02.000000000 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Apr 21 11:22:55 UTC 2021 - Imobach Gonzalez Sosa <igonzalezs...@suse.com>
+
+- AutoYaST: do not crash when cloning a registered system with
+  no registration code (bsc#1184216).
+- 4.4.1
+
+-------------------------------------------------------------------
 Tue Apr  6 16:04:44 UTC 2021 - David Diaz <dgonza...@suse.com>
 
 - Hide the abort button when the network client is called
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-registration-4.4.0/package/yast2-registration.spec 
new/yast2-registration-4.4.1/package/yast2-registration.spec
--- old/yast2-registration-4.4.0/package/yast2-registration.spec        
2021-04-07 16:58:07.000000000 +0200
+++ new/yast2-registration-4.4.1/package/yast2-registration.spec        
2021-05-03 16:35:02.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        4.4.0
+Version:        4.4.1
 Release:        0
 Summary:        YaST2 - Registration Module
 License:        GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-registration-4.4.0/src/data/registration/autoyast_summary.erb 
new/yast2-registration-4.4.1/src/data/registration/autoyast_summary.erb
--- old/yast2-registration-4.4.0/src/data/registration/autoyast_summary.erb     
2021-04-07 16:58:07.000000000 +0200
+++ new/yast2-registration-4.4.1/src/data/registration/autoyast_summary.erb     
2021-05-03 16:35:02.000000000 +0200
@@ -15,7 +15,7 @@
   <h3><%= _("Registration Settings") %></h3>
   <ul>
     <li><%= _("E-mail Address: %s") % h(@config.email) %></li>
-    <% if !@config.reg_code.empty? %>
+    <% if !@config.reg_code.to_s.empty? %>
       <li><%= _("Registration Code is Configured") %></li>
     <% end %>
 
@@ -26,17 +26,17 @@
 
   <h3><%= _("Registration Server") %></h3>
   <ul>
-    <% if !@config.reg_server.empty? %>
+    <% if !@config.reg_server.to_s.empty? %>
       <li><%= _("Server URL: %s") % h(@config.reg_server) %></li>
     <% elsif @config.slp_discovery %>
       <li><%= (_("Server URL: %s") % _("Use SLP discovery")) %></li>
     <% end %>
 
-    <% if !@config.reg_server_cert.empty? %>
+    <% if !@config.reg_server_cert.to_s.empty? %>
       <li><%= _("SSL Server Certificate URL: %s") % h(@config.reg_server_cert) 
%></li>
     <% end %>
 
-    <% if @config.reg_server_cert_fingerprint_type && 
!@config.reg_server_cert_fingerprint_type.empty? %>
+    <% if !@config.reg_server_cert_fingerprint_type.to_s.empty? %>
       <li><%= _("SSL Certificate Fingerprint: %s") % h(
           "#{@config.reg_server_cert_fingerprint} 
(#{@config.reg_server_cert_fingerprint_type})")
       %></li>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-registration-4.4.0/src/lib/registration/storage/config.rb 
new/yast2-registration-4.4.1/src/lib/registration/storage/config.rb
--- old/yast2-registration-4.4.0/src/lib/registration/storage/config.rb 
2021-04-07 16:58:07.000000000 +0200
+++ new/yast2-registration-4.4.1/src/lib/registration/storage/config.rb 
2021-05-03 16:35:02.000000000 +0200
@@ -70,12 +70,10 @@
         # all other config values are useless in that case
         return ret unless do_registration
 
-        ret.merge!(
-          "reg_server"      => reg_server,
-          "slp_discovery"   => slp_discovery,
-          "reg_code"        => reg_code,
-          "install_updates" => install_updates
-        )
+        ret["install_updates"] = install_updates
+        ret["slp_discovery"] = slp_discovery
+        ret["reg_server"] = reg_server if reg_server
+        ret["reg_code"] = reg_code if reg_code
         ret["email"] = email if email
         ret["addons"] = export_addons
         ret.merge!(export_ssl_config)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-registration-4.4.0/test/registration/storage/config_test.rb 
new/yast2-registration-4.4.1/test/registration/storage/config_test.rb
--- old/yast2-registration-4.4.0/test/registration/storage/config_test.rb       
2021-04-07 16:58:07.000000000 +0200
+++ new/yast2-registration-4.4.1/test/registration/storage/config_test.rb       
2021-05-03 16:35:02.000000000 +0200
@@ -92,6 +92,28 @@
         expect(subject.export.keys).to_not include("email")
       end
     end
+
+    context "when the reg_server is nil" do
+      before do
+        subject.do_registration = true
+        subject.reg_server = nil
+      end
+
+      it "does not include the reg_server" do
+        expect(subject.export.keys).to_not include("reg_server")
+      end
+    end
+
+    context "when the reg_code is nil" do
+      before do
+        subject.do_registration = true
+        subject.reg_code = nil
+      end
+
+      it "does not include the reg_code" do
+        expect(subject.export.keys).to_not include("reg_code")
+      end
+    end
   end
 
   describe "#import" do

Reply via email to