log the old credentials for easier debugging

yast · Jul 23, 2014 · 849cc6e · 849cc6e
1 parent e3b87de
commit 849cc6e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/lib/registration/sw_mgmt.rb b/src/lib/registration/sw_mgmt.rb
@@ -271,12 +271,17 @@ def self.copy_old_credentials(source_dir)
         log.info "Copying the old NCC credentials from previous installation"
         log.info "Copying #{ncc_file} to #{new_file}"
         ::FileUtils.cp(ncc_file, new_file)
+
+        credentials = SUSE::Connect::Credentials.read(new_file)
+        log.info "Using previous NCC credentials: #{credentials.inspect}"
       end
 
       if File.exist?(scc_file)
         log.info "Copying the old SCC credentials from previous installation"
         log.info "Copying #{scc_file} to #{new_file}"
         ::FileUtils.cp(scc_file, new_file)
+        credentials = SUSE::Connect::Credentials.read(new_file)
+        log.info "Using previous SCC credentials: #{credentials.inspect}"
       end
     end
 

diff --git a/test/sw_mgmt_spec.rb b/test/sw_mgmt_spec.rb
@@ -157,6 +157,7 @@
 
       expect(FileUtils).to receive(:cp).with(File.join(root_dir, target_dir, "NCCcredentials"),
         File.join(target_dir, "SCCcredentials"))
+      expect(SUSE::Connect::Credentials).to receive(:read)
 
       expect { Registration::SwMgmt.copy_old_credentials(root_dir) }.to_not raise_error
     end
@@ -167,6 +168,7 @@
 
       expect(FileUtils).to receive(:cp).with(File.join(root_dir, target_dir, "SCCcredentials"),
         File.join(target_dir, "SCCcredentials"))
+      expect(SUSE::Connect::Credentials).to receive(:read)
 
       expect { Registration::SwMgmt.copy_old_credentials(root_dir) }.to_not raise_error
     end