small lib/ refactoring

yast · Feb 26, 2014 · 7d55d60 · 7d55d60
1 parent 6347cb1
commit 7d55d60
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -9,7 +9,7 @@ desktop_DATA = \
 
 ylibdir = @ylibdir@/registration
 ylib_DATA = \
-  lib/registration/registration.rb
+  lib/registration/sw_mgmt.rb
 
 EXTRA_DIST = $(client_DATA) $(desktop_DATA) $(ylib_DATA)
 

diff --git a/src/clients/scc.rb b/src/clients/scc.rb
@@ -23,14 +23,16 @@
 
 # this is just a wrapper for running the SCC client in installed system
 
-require "registration/registration"
+require "registration/sw_mgmt"
 
 module Yast
   import "Wizard"
 
   Wizard.CreateDialog
-  Yast::Registration.initialize_libzypp
+  Registration::SwMgmt.init
+
   WFM.call("inst_scc")
-  Yast::Registration.save_libzypp
+
+  Registration::SwMgmt.save
   Wizard.CloseDialog
 end
diff --git a/src/lib/registration/registration.rb → src/lib/registration/sw_mgmt.rb b/src/lib/registration/registration.rb → src/lib/registration/sw_mgmt.rb
@@ -23,20 +23,23 @@
 
 require "yast"
 
-module Yast
+module Registration
   Yast.import "Pkg"
   Yast.import "Installation"
   Yast.import "PackageCallbacksInit"
 
-  class Registration
-    def self.initialize_libzypp
+  class SwMgmt
+    include Yast
+
+    def self.init
+      # display progress when refreshing repositories
       PackageCallbacksInit.InitPackageCallbacks
       Pkg.TargetInitialize(Installation.destdir)
       Pkg.TargetLoad
       Pkg.SourceStartManager(true)
     end
 
-    def self.save_libzypp
+    def self.save
       Pkg.SourceSaveAll
     end
   end