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

26 Feb 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



## BNC# 865737 : "Cannot register on a running system" (ASSIGNED/)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes	2014-02-25 16:53:00.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes	2014-02-26 15:12:17.000000000 +0100
@@ -1,0 +2,19 @@
+Wed Feb 26 14:44:09 CET 2014 - locilka@suse.com
+
+- Initializing packager before registration on a running system
+- Registering selected or installed products (both bnc#865737)
+- 3.1.12
+
+-------------------------------------------------------------------
+Wed Feb 26 10:11:05 UTC 2014 - vmoravec@suse.com
+
+- Check for defined client class
+- 3.1.11
+
+-------------------------------------------------------------------
+Tue Feb 25 16:37:23 UTC 2014 - lslezak@suse.cz
+
+- better error handling
+- 3.1.10
+
+-------------------------------------------------------------------

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:33458 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

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


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

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

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

Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.Kt9tiy/_old	2014-02-26 16:44:27.000000000 +0100
+++ /var/tmp/diff_new_pack.Kt9tiy/_new	2014-02-26 16:44:27.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        3.1.9
+Version:        3.1.12
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -31,7 +31,7 @@
 # Y2Logger
 Requires:       yast2-ruby-bindings >= 3.1.7
 # SCC API library
-Requires:       rubygem-scc_api >= 0.2.3
+Requires:       rubygem-scc_api >= 0.2.4
 Requires:       yast2-slp >= 3.1.2
 # Language module
 Requires:       yast2-country
@@ -68,6 +68,7 @@
 %defattr(-,root,root)
 %{yast_desktopdir}/customer_center.desktop
 %{yast_clientdir}/*.rb
+%{yast_dir}/lib/registration
 %doc %{yast_docdir}
 
 %changelog

++++++ yast2-registration-3.1.9.tar.bz2 -> yast2-registration-3.1.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.9/package/yast2-registration.changes new/yast2-registration-3.1.12/package/yast2-registration.changes
--- old/yast2-registration-3.1.9/package/yast2-registration.changes	2014-02-25 13:34:58.000000000 +0100
+++ new/yast2-registration-3.1.12/package/yast2-registration.changes	2014-02-26 15:09:57.000000000 +0100
@@ -1,4 +1,23 @@
 -------------------------------------------------------------------
+Wed Feb 26 14:44:09 CET 2014 - locilka@suse.com
+
+- Initializing packager before registration on a running system
+- Registering selected or installed products (both bnc#865737)
+- 3.1.12
+
+-------------------------------------------------------------------
+Wed Feb 26 10:11:05 UTC 2014 - vmoravec@suse.com
+
+- Check for defined client class
+- 3.1.11
+
+-------------------------------------------------------------------
+Tue Feb 25 16:37:23 UTC 2014 - lslezak@suse.cz
+
+- better error handling
+- 3.1.10
+
+-------------------------------------------------------------------
 Tue Feb 25 09:14:24 UTC 2014 - lslezak@suse.cz
 
 - make the credentials input fields wider (bnc#864882)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.9/package/yast2-registration.spec new/yast2-registration-3.1.12/package/yast2-registration.spec
--- old/yast2-registration-3.1.9/package/yast2-registration.spec	2014-02-25 13:34:58.000000000 +0100
+++ new/yast2-registration-3.1.12/package/yast2-registration.spec	2014-02-26 15:09:57.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        3.1.9
+Version:        3.1.12
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -31,7 +31,7 @@
 # Y2Logger
 Requires:       yast2-ruby-bindings >= 3.1.7
 # SCC API library
-Requires:       rubygem-scc_api >= 0.2.3
+Requires:       rubygem-scc_api >= 0.2.4
 Requires:       yast2-slp >= 3.1.2
 # Language module
 Requires:       yast2-country
@@ -68,6 +68,7 @@
 %defattr(-,root,root)
 %{yast_desktopdir}/customer_center.desktop
 %{yast_clientdir}/*.rb
+%{yast_dir}/lib/registration
 %doc %{yast_docdir}
 
 %changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.9/src/Makefile.am new/yast2-registration-3.1.12/src/Makefile.am
--- old/yast2-registration-3.1.9/src/Makefile.am	2014-02-25 13:34:58.000000000 +0100
+++ new/yast2-registration-3.1.12/src/Makefile.am	2014-02-26 15:09:57.000000000 +0100
@@ -7,6 +7,10 @@
 desktop_DATA = \
   desktop/customer_center.desktop
 
-EXTRA_DIST = $(client_DATA) $(desktop_DATA)
+ylibdir = @ylibdir@/registration
+ylib_DATA = \
+  lib/registration/registration.rb
+
+EXTRA_DIST = $(client_DATA) $(desktop_DATA) $(ylib_DATA)
 
 include $(top_srcdir)/Makefile.am.common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.9/src/clients/discover_registration_services.rb new/yast2-registration-3.1.12/src/clients/discover_registration_services.rb
--- old/yast2-registration-3.1.9/src/clients/discover_registration_services.rb	2014-02-25 13:34:58.000000000 +0100
+++ new/yast2-registration-3.1.12/src/clients/discover_registration_services.rb	2014-02-26 15:09:57.000000000 +0100
@@ -116,6 +116,6 @@
     ensure
       Popup.ClearFeedback
     end
-  end
+  end unless defined?(DiscoverRegistrationServicesClient)
   DiscoverRegistrationServicesClient.new.main
 end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.9/src/clients/inst_scc.rb new/yast2-registration-3.1.12/src/clients/inst_scc.rb
--- old/yast2-registration-3.1.9/src/clients/inst_scc.rb	2014-02-25 13:34:58.000000000 +0100
+++ new/yast2-registration-3.1.12/src/clients/inst_scc.rb	2014-02-26 15:09:57.000000000 +0100
@@ -63,14 +63,36 @@
         if ret == :next
           email = UI.QueryWidget(:email, :Value)
           reg_code = UI.QueryWidget(:reg_code, :Value)
+          # reset the user input in case an exception is raised
+          ret = nil
 
           begin
             register(email, reg_code)
+            return :next
+          rescue SccApi::NoNetworkError
+            # Error popup
+            Report.Error(_("Network is not configured, the registration server cannot be reached."))
+          rescue SccApi::NotAuthorized
+            # Error popup
+            Report.Error(_("The email address or the registration\ncode is not valid."))
+          rescue Timeout::Error
+            # Error popup
+            Report.Error(_("Connection time out."))
+          rescue SccApi::ErrorResponse => e
+            # TODO FIXME: display error details from the response
+            Report.Error(_("Registration server error.\n\nRetry registration later."))
+          rescue SccApi::HttpError => e
+            case e.response
+            when Net::HTTPClientError
+              Report.Error(_("Registration client error."))
+            when Net::HTTPServerError
+              Report.Error(_("Registration server error.\n\nRetry registration later."))
+            else
+              Report.Error(_("Registration failed."))
+            end
           rescue Exception => e
             log.error("SCC registration failed: #{e}, #{e.backtrace}")
-            # TODO: display error details
             Report.Error(_("Registration failed."))
-            ret = nil
           end
         end
 
@@ -199,14 +221,16 @@
 
       # 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
+      #
+      # on a running system, products are :installed
       selected_base_products = Pkg.ResolvableProperties("", :product, "").find_all do |p|
-        p["source"] == 0 && p["status"] == :selected
+        p["status"] == :selected || p["status"] == :installed
       end
 
       # filter out not needed data
       product_info = selected_base_products.map{|p| { "name" => p["name"], "arch" => p["arch"], "version" => p["version"]}}
 
-      log.info("Found selected base products: #{product_info}")
+      log.info("Found selected/installed base products: #{product_info}")
 
       product_info
     end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.9/src/clients/scc.rb new/yast2-registration-3.1.12/src/clients/scc.rb
--- old/yast2-registration-3.1.9/src/clients/scc.rb	2014-02-25 13:34:58.000000000 +0100
+++ new/yast2-registration-3.1.12/src/clients/scc.rb	2014-02-26 15:09:57.000000000 +0100
@@ -23,11 +23,14 @@
 
 # this is just a wrapper for running the SCC client in installed system
 
+require "registration/registration"
+
 module Yast
   import "Wizard"
 
   Wizard.CreateDialog
+  Yast::Registration.initialize_libzypp
   WFM.call("inst_scc")
+  Yast::Registration.save_libzypp
   Wizard.CloseDialog
 end
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.9/src/lib/registration/registration.rb new/yast2-registration-3.1.12/src/lib/registration/registration.rb
--- old/yast2-registration-3.1.9/src/lib/registration/registration.rb	1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-3.1.12/src/lib/registration/registration.rb	2014-02-26 15:09:57.000000000 +0100
@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+# ------------------------------------------------------------------------------
+# Copyright (c) 2014 Novell, Inc. All Rights Reserved.
+#
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of version 2 of the GNU General Public License as published by the
+# Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, contact Novell, Inc.
+#
+# To contact Novell about this file by physical or electronic mail, you may find
+# current contact information at www.novell.com.
+# ------------------------------------------------------------------------------
+#
+#
+
+require "yast"
+
+module Yast
+  Yast.import "Pkg"
+  Yast.import "Installation"
+  Yast.import "PackageCallbacksInit"
+
+  class Registration
+    def self.initialize_libzypp
+      PackageCallbacksInit.InitPackageCallbacks
+      Pkg.TargetInitialize(Installation.destdir)
+      Pkg.TargetLoad
+      Pkg.SourceStartManager(true)
+    end
+
+    def self.save_libzypp
+      Pkg.SourceSaveAll
+    end
+  end
+end
+

continue with "q"...


Checked in at Wed Feb 26 16:44:40 CET 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

    

ro

tags

participants (1)