Better handle invalid credentials (bsc#941427)

Start the repository manager to remove the offending service/repository.

package/yast2-registration.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Oct  3 19:11:11 UTC 2016 - lslezak@suse.cz
+
+- Better handle invalid credentials at start - start the repository
+  manager to allow manually removing the offending service or
+  repository (bsc#941427)
+- 3.1.190
+
 -------------------------------------------------------------------
 Mon Oct  3 09:26:28 UTC 2016 - jreidinger@suse.com
 

package/yast2-registration.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        3.1.189
+Version:        3.1.190
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/clients/scc.rb

@@ -26,8 +26,13 @@
 require "yast"
 require "registration/sw_mgmt"
 
+# HTML escaping
+require "cgi/util"
+
 module Yast
   class SccClient < Client
+    include Yast::Logger
+
     Yast.import "CommandLine"
     Yast.import "Pkg"
     Yast.import "Report"
@@ -51,6 +56,16 @@ def main
           ::Registration::SwMgmt.init
 
           return WFM.call("inst_scc", WFM.Args)
+        rescue Registration::SourceRestoreError => e
+          # TRANSLATORS: Error message in RichText format, %s contains the details from libzypp
+          Report.LongError(_("<p>The repository initialization failed. " \
+            "Disable (or remove) the offending service or repository " \
+            "in the repository manager.</p><p>Details:</p><p>%s</p>") % CGI.escapeHTML(e.message))
+          ret = WFM.call("repositories", WFM.Args)
+          log.info "repository manager result: #{ret}"
+          # drop all loaded repos, force complete reloading
+          Pkg.SourceFinishAll
+          retry if ret == :next
         ensure
           Wizard.CloseDialog
         end

src/lib/registration/exceptions.rb

@@ -35,6 +35,9 @@ def initialize(msg, service)
     end
   end
 
+  class SourceRestoreError < PkgError
+  end
+
   # generic download error
   class DownloadError < RuntimeError
   end

src/lib/registration/sw_mgmt.rb

@@ -73,7 +73,7 @@ def self.init(load_packages = false)
 
       raise_pkg_exception unless Pkg.TargetInitialize(Installation.destdir)
       raise_pkg_exception unless Pkg.TargetLoad
-      raise_pkg_exception unless Pkg.SourceRestore
+      raise_pkg_exception(SourceRestoreError) unless Pkg.SourceRestore
 
       raise_pkg_exception if load_packages && !Pkg.SourceLoad
     end
@@ -499,8 +499,8 @@ def self.get_release_type(product)
       product["register_release"]
     end
 
-    def self.raise_pkg_exception
-      raise PkgError.new, Pkg.LastError
+    def self.raise_pkg_exception(klass = PkgError)
+      raise klass, Pkg.LastError
     end
 
     private_class_method :each_repo

test/sw_mgmt_spec.rb

@@ -56,14 +56,23 @@
     context "when the libzypp lock can be obtained" do
       let(:connected) { true }
 
-      it "initializes package management" do
+      before do
         expect(Yast::PackageCallbacks).to receive(:InitPackageCallbacks)
         expect(Yast::Pkg).to receive(:TargetInitialize).and_return(true)
         expect(Yast::Pkg).to receive(:TargetLoad).and_return(true)
+      end
+
+      it "initializes package management" do
         expect(Yast::Pkg).to receive(:SourceRestore).and_return(true)
 
         subject.init
       end
+
+      it "raises SourceRestoreError exception when the repository restore fails" do
+        expect(Yast::Pkg).to receive(:SourceRestore).and_return(false)
+
+        expect { subject.init }.to raise_exception(Registration::SourceRestoreError)
+      end
     end
 
     context "when the libzypp lock cannot be obtained" do