do not stuck during compress if file already exists (bnc#897091)

yast · Jan 7, 2015 · dd87e2d · dd87e2d
1 parent 522e70c
commit dd87e2d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/lib/installation/copy_logs_finish.rb b/src/lib/installation/copy_logs_finish.rb
@@ -70,7 +70,7 @@ def write
             Yast::Directory.logdir,
             target_basename
           )
-          compress_cmd = "gzip #{target_path}"
+          compress_cmd = "gzip -f #{target_path}"
           log.debug "Compress command: #{compress_cmd}"
           Yast::WFM.Execute(LOCAL_BASH, compress_cmd)
         when /\Ay2log-\d+\.gz\z/

diff --git a/test/copy_logs_finish_test.rb b/test/copy_logs_finish_test.rb
@@ -34,6 +34,14 @@
       subject.write
     end
 
+    it "do not stuck during compress if file already exists (bnc#897091)" do
+      allow(Yast::WFM).to receive(:Read).and_return(["y2log-1"])
+
+      expect(Yast::WFM).to receive(:Execute).with(anything(), /gzip -f/)
+
+      subject.write
+    end
+
     it "rotate zypp.log" do
       allow(Yast::WFM).to receive(:Read).and_return(["zypp.log"])