Update from code review

src/lib/installation/updates_manager.rb

@@ -16,6 +16,7 @@
 require "pathname"
 require "installation/driver_update"
 require "installation/update_repository"
+require "yast2/execute"
 
 module Installation
   # This class takes care of managing installer updates
@@ -55,9 +56,6 @@ class CouldNotFetchUpdateFromRepo < RepoError; end
     # Repo is unreachable (name solving issues, etc.).
     class CouldNotProbeRepo < RepoError; end
 
-    # The control file was not updated due to some problem
-    class CouldNotUpdateControlFile < RepoError; end
-
     DRIVER_UPDATES_PATHS = [Pathname("/update"), Pathname("/download")].freeze
 
     # Constructor
@@ -128,15 +126,12 @@ def repositories?
   private
 
     NEW_CONTROL_FILE_PATH = "/usr/lib/skelcd/CD1/control.xml".freeze
-    APPLY_CMD = "/sbin/adddir %<source>s /".freeze
 
-    # Replaces the control file with the the updated one (if it exists)
+    # Replaces the control file with the updated one (if it exists)
     def replace_control_file
       return unless File.exist?(NEW_CONTROL_FILE_PATH)
-      cmd = format(APPLY_CMD, source: File.dirname(NEW_CONTROL_FILE_PATH))
-      out = Yast::SCR.Execute(Yast::Path.new(".target.bash_output"), cmd)
-      log.info("Updating control.xml file in inst-sys '#{cmd}': #{out}")
-      raise CouldNotUpdateControlFile unless out["exit"].zero?
+      log.info("Updating control.xml file in inst-sys")
+      Yast::Execute.locally!("/sbin/adddir", File.dirname(NEW_CONTROL_FILE_PATH), "/")
     end
   end
 end

test/updates_manager_test.rb

@@ -131,26 +131,18 @@
 
     context "when a new control file is available" do
       let(:new_control_file?) { true }
-      let(:exit_code) { 0 }
 
-      before do
-        allow(Yast::SCR).to receive(:Execute).and_return("exit" => exit_code)
-      end
-
-      it "updates the control file if needed" do
-        expect(Yast::SCR).to receive(:Execute)
-          .with(Yast::Path.new(".target.bash_output"), "/sbin/adddir /usr/lib/skelcd/CD1 /")
+      it "updates the control file" do
+        expect(Yast::Execute).to receive(:locally!)
+          .with("/sbin/adddir", "/usr/lib/skelcd/CD1", "/")
         manager.apply_all
       end
+    end
 
-      context "and updating the control file fails" do
-        let(:exit_code) { 1 }
-
-        it "raises an exception" do
-          expect { manager.apply_all }
-            .to raise_error(Installation::UpdatesManager::CouldNotUpdateControlFile)
-        end
-      end
+    it "does not replace the control file" do
+      expect(Yast::Execute).to_not receive(:locally!)
+        .with("/sbin/adddir", /skelcd/, "/")
+      manager.apply_all
     end
   end