fixed setting the repository status (bnc#875839)

to properly enable e.g. the *-Pool repositories

- 3.1.48

package/yast2-registration.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed May  7 11:38:30 UTC 2014 - lslezak@suse.cz
+
+- fixed setting the repository status (to properly enable e.g. the
+  *-Pool repositories) (bnc#875839)
+- 3.1.48
+
 -------------------------------------------------------------------
 Tue May  6 12:38:51 UTC 2014 - lslezak@suse.cz
 

package/yast2-registration.spec

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

src/lib/registration/sw_mgmt.rb

@@ -111,7 +111,7 @@ def self.base_product_label(base_product)
     def self.base_product_to_register
       # just for debugging:
       # return {"name" => "SLES", "arch" => "x86_64", "version" => "12",
-      #   "release_type" => "DVD"
+      #  "release_type" => "DVD"
       # }
 
       base_product = find_base_product
@@ -188,8 +188,14 @@ def self.add_services(product_services, credentials)
       end
 
       # activate the requested repository setup
-      repos_enable(product_services.map(&:enabled).flatten)
-      repos_disable_autorefresh(product_services.map(&:norefresh).flatten)
+      product_services.each do |product_service|
+        # there is only one service
+        service_name = product_service.sources.first.name
+        log.info "Updating repositories for service: #{service_name}"
+
+        repos_enable(service_aliases(service_name, product_service.enabled))
+        repos_disable_autorefresh(service_aliases(service_name, product_service.norefresh))
+      end
     ensure
       Pkg.SourceSaveAll
     end
@@ -274,8 +280,14 @@ def self.each_repo(repo_aliases, &block)
         end
       end
     end
+
+    # get libzypp repository aliases for a service
+    # (libzypp internally uses the service name as the prefix)
+    def self.service_aliases(service, aliases)
+      aliases.map{ |a| "#{service}:#{a}"}
+    end
 
-    private_class_method :each_repo
+    private_class_method :each_repo, :service_aliases
   end
 end
 

test/sw_mgmt_spec.rb

@@ -94,8 +94,8 @@
     let(:service_url) { "https://example.com/foo/bar?credentials=TEST_credentials" }
     let(:credentials) { SUSE::Connect::Credentials.new("user", "password", "file") }
     let(:product_services) do
-      SUSE::Connect::Service.new({service_name => service_url}, ["SLES:SLES12-Pool"],
-        ["SLES:SLES12-Pool"])
+      SUSE::Connect::Service.new({service_name => service_url}, ["SLES12-Pool"],
+        ["SLES12-Pool"])
     end
 
     before do