[yast-devel] [ci_new_pac] JFYI yast2-registration -> sle12

28 Jan 2014

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-registration -> sle12




Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes	2014-01-23 13:24:25.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes	2014-01-28 10:13:38.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Jan 27 15:11:17 UTC 2014 - lslezak@suse.cz
+
+- added "Skip Registration" button (FATE#312925)
+- workaround for SCC not accepting JSON input
+- 3.1.2
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-registration
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-registration (Old)
 and      /mounts/work_src_done/SLE12/yast2-registration (BS:build ID:31232 MAIL:yast-devel@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-registration", Maintainer is "yast-devel@opensuse.org"


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

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

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

Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.L20LXB/_old	2014-01-28 14:13:33.000000000 +0100
+++ /var/tmp/diff_new_pack.L20LXB/_new	2014-01-28 14:13:33.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        3.1.1
+Version:        3.1.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-registration-3.1.1.tar.bz2 -> yast2-registration-3.1.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.1/package/yast2-registration.changes new/yast2-registration-3.1.2/package/yast2-registration.changes
--- old/yast2-registration-3.1.1/package/yast2-registration.changes	2014-01-21 11:26:15.000000000 +0100
+++ new/yast2-registration-3.1.2/package/yast2-registration.changes	2014-01-28 10:10:46.000000000 +0100
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Jan 27 15:11:17 UTC 2014 - lslezak@suse.cz
+
+- added "Skip Registration" button (FATE#312925)
+- workaround for SCC not accepting JSON input
+- 3.1.2
+
+-------------------------------------------------------------------
 Tue Jan 21 10:19:13 UTC 2014 - lslezak@suse.cz
 
 - changed the implementation to use SCC instead of NCC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.1/package/yast2-registration.spec new/yast2-registration-3.1.2/package/yast2-registration.spec
--- old/yast2-registration-3.1.1/package/yast2-registration.spec	2014-01-21 11:26:15.000000000 +0100
+++ new/yast2-registration-3.1.2/package/yast2-registration.spec	2014-01-28 10:10:46.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        3.1.1
+Version:        3.1.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.1/src/clients/inst_scc.rb new/yast2-registration-3.1.2/src/clients/inst_scc.rb
--- old/yast2-registration-3.1.1/src/clients/inst_scc.rb	2014-01-21 11:26:15.000000000 +0100
+++ new/yast2-registration-3.1.2/src/clients/inst_scc.rb	2014-01-28 10:10:46.000000000 +0100
@@ -50,16 +50,18 @@
           email = UI.QueryWidget(:email, :Value)
           reg_code = UI.QueryWidget(:reg_code, :Value)
 
-          if !email.empty? && !reg_code.empty?
-            begin
-              register(email, reg_code)
-            rescue Exception => e
-              Builtins.y2error("SCC registration failed: #{e}, #{e.backtrace}")
-              # TODO: display error details
-              ret = nil if Popup.YesNo(_("Registration failed.\nTry it again?"))
-            end
+          begin
+            register(email, reg_code)
+          rescue Exception => e
+            Builtins.y2error("SCC registration failed: #{e}, #{e.backtrace}")
+            # TODO: display error details
+            Report.Error(_("Registration failed."))
+            ret = nil
           end
         end
+
+        # skip the registration
+        return :next if ret == :skip
       end
 
       return ret
@@ -89,7 +91,8 @@
           result = scc.register(base_product)
 
           # TODO: remove this
-          Popup.Message("SCC response:\n#{JSON.pretty_generate(result)}")
+          # Popup.Message("SCC response:\n#{JSON.pretty_generate(result)}")
+          Popup.Message("The system has been registered.")
         end
       ensure
         Popup.ClearFeedback
@@ -97,15 +100,18 @@
     end
 
     def scc_credentials_dialog
-      Frame(_("SUSE Customer Center Credentials"),
-        MarginBox(1, 0.5,
-          VBox(
-            InputField(Id(:email), _("&Email")),
-            VSpacing(0.5),
-            # FIXME: remove the testing reg. key, leave the field empty by default
-            InputField(Id(:reg_code), _("Registration &Code"), "4e4ad427")
+      VBox(
+        Frame(_("SUSE Customer Center Credentials"),
+          MarginBox(1, 0.5,
+            VBox(
+              InputField(Id(:email), _("&Email")),
+              VSpacing(0.5),
+              InputField(Id(:reg_code), _("Registration &Code"))
+            )
           )
-        )
+        ),
+        VSpacing(3),
+        PushButton(Id(:skip), _("&Skip Registration"))
       )
     end
 
@@ -125,6 +131,8 @@
     end
 
     def selected_base_products
+      # just for debugging: return [{"name" => "SUSE_SLES", "arch" => "x86_64", "version" => "12"}]
+
       # source 0 is the base installation repo, the repos added later are considered as add-ons
       # although they can also contain a different base product
       selected_base_products = Pkg.ResolvableProperties("", :product, "").find_all do |p|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.1/src/lib/registration/scc_client.rb new/yast2-registration-3.1.2/src/lib/registration/scc_client.rb
--- old/yast2-registration-3.1.1/src/lib/registration/scc_client.rb	2014-01-21 11:26:15.000000000 +0100
+++ new/yast2-registration-3.1.2/src/lib/registration/scc_client.rb	2014-01-28 10:10:46.000000000 +0100
@@ -24,7 +24,10 @@
     MAX_REDIRECTS = 10
 
     JSON_HTTP_HEADER = {
-      "Content-Type" => "application/json",
+      # TODO FIXME: a workaround for SCC not accepting JSON input,
+      #  remove when JSON is correctly supported and use this instead:
+      #  "Content-Type" => "application/json",
+      "Content-Type" => "application/x-www-form-urlencoded",
       "Accept" => "application/json"
     }
 
@@ -56,7 +59,8 @@
       params = {
         :url => URI(url + "/announce"),
         :headers => {"Authorization" => "Token token=\"#{reg_code}\""},
-        :body => body,
+         # TODO FIXME: a workaround for SCC not accepting JSON input
+        :body => "payload=#{URI.escape body}",
         :method => :post
       }
 
@@ -66,6 +70,8 @@
     end
 
     def register(base_product)
+      Builtins.y2milestone("Registering base product: #{base_product.inspect}")
+
       body = {
         "token" => reg_code,
         "product_ident" => base_product["name"],
@@ -75,7 +81,8 @@
 
       params = {
         :url => URI(url + "/activate"),
-        :body => body,
+        # TODO FIXME: a workaround for SCC not accepting JSON input
+        :body => "payload=#{URI.escape body}",
         :method => :post,
         :credentials => credentials
       }

continue with "q"...


Checked in at Tue Jan 28 14:13:59 CET 2014 by ro

Remember to have fun...

-- 
To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org
To contact the owner, e-mail: yast-devel+owner@opensuse.org

    

ro

tags

participants (1)