Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2021-10-12 21:48:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Tue Oct 12 21:48:30 2021 rev:480 rq:924608 version:4.4.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2021-10-04 18:39:40.958030006 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new.2443/yast2-installation.changes
2021-10-12 21:49:51.003914387 +0200
@@ -1,0 +2,7 @@
+Fri Oct 8 10:04:16 UTC 2021 - Imobach Gonzalez Sosa <igonzalezs...@suse.com>
+
+- Fix file copying when using relurl:// and file:// naming schemes
+ (bsc#1191160).
+- 4.4.20
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-4.4.19.tar.bz2
New:
----
yast2-installation-4.4.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.fFtp4N/_old 2021-10-12 21:49:51.811915543 +0200
+++ /var/tmp/diff_new_pack.fFtp4N/_new 2021-10-12 21:49:51.815915549 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 4.4.19
+Version: 4.4.20
Release: 0
Summary: YaST2 - Installation Parts
License: GPL-2.0-only
++++++ yast2-installation-4.4.19.tar.bz2 -> yast2-installation-4.4.20.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.19/package/yast2-installation.changes
new/yast2-installation-4.4.20/package/yast2-installation.changes
--- old/yast2-installation-4.4.19/package/yast2-installation.changes
2021-10-01 12:50:01.000000000 +0200
+++ new/yast2-installation-4.4.20/package/yast2-installation.changes
2021-10-11 08:46:19.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Oct 8 10:04:16 UTC 2021 - Imobach Gonzalez Sosa <igonzalezs...@suse.com>
+
+- Fix file copying when using relurl:// and file:// naming schemes
+ (bsc#1191160).
+- 4.4.20
+
+-------------------------------------------------------------------
Wed Sep 29 16:13:17 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
- Release the sources and close the libzypp cache to allow
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.19/package/yast2-installation.spec
new/yast2-installation-4.4.20/package/yast2-installation.spec
--- old/yast2-installation-4.4.19/package/yast2-installation.spec
2021-10-01 12:50:01.000000000 +0200
+++ new/yast2-installation-4.4.20/package/yast2-installation.spec
2021-10-11 08:46:19.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 4.4.19
+Version: 4.4.20
Release: 0
Summary: YaST2 - Installation Parts
License: GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.19/src/lib/transfer/file_from_url.rb
new/yast2-installation-4.4.20/src/lib/transfer/file_from_url.rb
--- old/yast2-installation-4.4.19/src/lib/transfer/file_from_url.rb
2021-10-01 12:50:01.000000000 +0200
+++ new/yast2-installation-4.4.20/src/lib/transfer/file_from_url.rb
2021-10-11 08:46:19.000000000 +0200
@@ -182,9 +182,7 @@
elsif _Scheme == "file"
file = Builtins.sformat("%1/%2", Installation.sourcedir, _Path) #
FIXME: I have doubts this will ever work. Too early.
if Ops.greater_than(SCR.Read(path(".target.size"), file), 0)
- cpcmd = Builtins.sformat("/bin/cp %1 %2", file, _Localfile)
- Builtins.y2milestone("Copy profile: %1", cpcmd)
- SCR.Execute(path(".target.bash"), cpcmd)
+ copy_local_file(file, _Localfile)
else
@GET_error = Ops.add(
@GET_error,
@@ -194,12 +192,10 @@
_Path
)
)
- cpcmd = Builtins.sformat("/bin/cp %1 %2", _Path, _Localfile)
- Builtins.y2milestone("Copy profile: %1", cpcmd)
- SCR.Execute(path(".target.bash"), cpcmd)
+ copy_local_file(_Path, _Localfile)
end
- if Ops.greater_than(SCR.Read(path(".target.size"), _Localfile), 0)
+ if File.exist?(_Localfile)
@GET_error = ""
ok = true
else
@@ -263,15 +259,9 @@
end
end
if ok
- cpcmd = Builtins.sformat(
- Ops.add(Ops.add("/bin/cp ", mount_point), "/%1 %2"),
- _Path,
- _Localfile
- )
- Builtins.y2milestone("Copy profile: %1", cpcmd)
- SCR.Execute(path(".target.bash"), cpcmd)
+ copy_local_file(File.join(mount_point, _Path), _Localfile)
WFM.Execute(path(".local.umount"), mount_point)
- if Ops.greater_than(SCR.Read(path(".target.size"), _Localfile),
0)
+ if File.exist?(_Localfile)
@GET_error = ""
return true
end
@@ -531,5 +521,18 @@
end
ok
end
+
+ private
+
+ # Copy a file
+ #
+ # @param source [String] Source file path
+ # @param destination [String] Destination file path
+ def copy_local_file(source, destination)
+ log.info "Copying #{source} to #{destination}"
+ ::FileUtils.cp(source, destination)
+ rescue SystemCallError => e
+ log.warn "Could not copy #{source} to #{destination}: #{e.inspect}"
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-4.4.19/test/file_from_url_test.rb
new/yast2-installation-4.4.20/test/file_from_url_test.rb
--- old/yast2-installation-4.4.19/test/file_from_url_test.rb 2021-10-01
12:50:01.000000000 +0200
+++ new/yast2-installation-4.4.20/test/file_from_url_test.rb 2021-10-11
08:46:19.000000000 +0200
@@ -3,6 +3,7 @@
require_relative "test_helper"
require "transfer/file_from_url"
+require "tmpdir"
describe Yast::Transfer::FileFromUrl do
Yast.import "Installation"
@@ -34,13 +35,13 @@
describe "#Get" do
before do
- expect(Yast::WFM).to receive(:Read)
- .and_return("/tmp_dir")
+ expect(Yast::WFM).to receive(:Read).with(path(".local.tmpdir"), [])
+ .and_return(tmpdir)
expect(Yast::WFM).to receive(:SCRGetDefault)
.and_return(333)
expect(Yast::WFM).to receive(:SCRGetName).with(333)
.and_return("chroot=/mnt:scr")
- expect(Yast::WFM).to receive(:Execute)
+ allow(Yast::WFM).to receive(:Execute)
.with(path(".local.mkdir"), "/destdir/tmp_dir/tmp_mount")
# the local/target mess was last modified in
#
https://github.com/yast/yast-autoinstallation/commit/69f1966dd1456301a69102c6d3bacfe7c9f9dc49
@@ -49,6 +50,7 @@
allow(Yast::Execute).to receive(:new).and_return(execute_object)
end
+ let(:tmpdir) { "/tmp_dir" }
let(:execute_object) { Yast::Execute.new }
it "returns false for unknown scheme" do
@@ -179,56 +181,120 @@
end
context "when scheme is 'file'" do
let(:scheme) { "file" }
- let(:destination) { "/tmp/auto.xml" }
- let(:source) { "/oss.xml" }
let(:cd_device) { "/dev/sr0" }
- let(:tmp_mount) { "/tmp_dir/tmp_mount" }
+ let(:tmp_mount) { File.join(tmpdir, "tmp_mount") }
+ let(:destination) { File.join(dir, "dest") }
+ let(:source) { File.join(dir, "source") }
+ let(:dir) { Dir.mktmpdir }
before do
- allow(Yast::SCR).to receive(:Execute)
- .with(Yast::Path.new(".target.bash"), "/bin/cp
#{tmp_mount}/#{source} #{destination}")
- allow(Yast::SCR).to receive(:Execute)
- .with(Yast::Path.new(".target.bash"), "/bin/cp #{source}
#{destination}")
- allow(Yast::WFM).to receive(:Execute)
- .with(Yast::Path.new(".local.umount"), tmp_mount)
- allow(Yast::Installation).to receive(:sourcedir).and_return("/mnt")
+ allow(Yast::Installation).to
receive(:sourcedir).and_return(File.join(dir, "mnt"))
allow(Yast::Installation).to receive(:boot).and_return("cd")
allow(Yast::InstURL).to
receive("installInf2Url").and_return("cd:/?devices=#{cd_device}")
- expect(Yast::SCR).to receive(:Read)
- .with(Yast::Path.new(".target.size"), "/mnt/#{source}").and_return(0)
- expect(Yast::SCR).to receive(:Read)
- .with(Yast::Path.new(".target.size"), destination).and_return(0, 10)
+ allow(Yast::Builtins).to receive(:sleep).with(3000)
+
+ allow(Yast::SCR).to receive(:Execute)
+ .with(path(".target.bash"), /bin\/cp/) do |*args|
+ cmd = args.last
+ _, from, to = cmd.split(" ")
+ begin
+ FileUtils.cp(from, to)
+ rescue Errno::ENOENT
+ nil
+ end
+ end
+
+ allow(Yast::WFM).to receive(:Execute)
+ .with(path(".local.mount"), anything).and_return(false)
end
- context "CD has already been mounted multiple times" do
+ after do
+ FileUtils.remove_entry(dir) if File.exist?(dir)
+ end
+
+ context "when the source file exists in the installation sourcedir" do
before do
- allow(File).to receive(:read).with("/proc/mounts").and_return(
- "#{cd_device} /mounts/mp_0005 iso9660 ro,relatime 0 0\n"\
- "#{cd_device} /mounts/mp_0006 iso9660 ro,relatime 0 0"
- )
+ inst_source = File.join(Yast::Installation.sourcedir, source)
+ FileUtils.mkdir_p(File.dirname(inst_source))
+ File.write(inst_source, "sourcedir")
end
- it "mounts with --bind option and returns true" do
- expect(Yast::SCR).to receive(:Execute)
- .with(Yast::Path.new(".target.bash_output"), "/bin/mount -v --bind
/mounts/mp_0005 #{tmp_mount}")
- .and_return("exit" => 0, "stdout" => "ok")
+ it "tries to copy the file from the installation sourcedir" do
expect(subject.Get(scheme, "", source, destination)).to eq(true)
+ expect(File.read(destination)).to eq("sourcedir")
+ end
+ end
+
+ context "when the source file exists" do
+ before { File.write(source, "testing") }
+
+ it "copies the file to the given destination and returns true" do
+ expect(subject.Get(scheme, "", source, destination)).to eq(true)
+ expect(File.read(destination)).to eq("testing")
+ end
+ end
+
+ context "when the source file does not exist" do
+ it "returns false" do
+ expect(subject.Get(scheme, "", source, destination)).to eq(false)
+ end
+ end
+
+ context "when the destination directory does not exist" do
+ let(:destination) { File.join(dir, "not", "a", "directory") }
+
+ before { File.write(source, "testing") }
+
+ it "returns false" do
+ expect(subject.Get(scheme, "", source, destination)).to eq(false)
end
end
- context "CD has not been mounted" do
+ context "when the file cannot be copied and the installation medium is a
CD/DVD" do
+ let(:mounts) { "" }
+ let(:tmpdir) { File.join(dir, "tmp") }
+ let(:source_on_dvd) { File.join(tmp_mount, source) }
+
before do
- allow(File).to receive(:read).with("/proc/mounts").and_return("")
+ allow(Yast::WFM).to receive(:Execute).with(path(".local.mkdir"),
anything)
+ allow(Yast::WFM).to receive(:Execute)
+ .with(path(".local.mount"), anything).and_return(true)
+ allow(File).to receive(:read).and_call_original
+ allow(File).to receive(:read).with("/proc/mounts").and_return(mounts)
+
+ FileUtils.mkdir_p(File.dirname(source_on_dvd))
+ File.write(source_on_dvd, "testing")
end
- it "mounts CD and returns true" do
+ it "tries to copy the file from the CD/DVD" do
expect(Yast::WFM).to receive(:Execute)
.with(Yast::Path.new(".local.mount"), [cd_device, tmp_mount,
Yast::Installation.mountlog])
.and_return(true)
- expect(subject.Get(scheme, "", source, destination)).to eq(true)
+ expect(Yast::WFM).to receive(:Execute).with(path(".local.umount"),
anything)
+
+ expect(subject.Get(scheme, "", source, destination))
+ expect(File.read(destination)).to eq("testing")
+ end
+
+ context "and the CD/DVD is already mounted" do
+ let(:mounts) do
+ "#{cd_device} /mounts/mp_0005 iso9660 ro,relatime 0 0\n" \
+ "#{cd_device} /mounts/mp_0006 iso9660 ro,relatime 0 0"
+ end
+
+ it "bind mounts the CD/DVD and tries to copy the file from it" do
+ expect(Yast::SCR).to receive(:Execute)
+ .with(path(".target.bash_output"), "/bin/mount -v --bind
/mounts/mp_0005 #{tmp_mount}")
+ .and_return("exit" => 0, "stdout" => "ok")
+ expect(Yast::WFM).to receive(:Execute).with(path(".local.umount"),
anything)
+
+ expect(subject.Get(scheme, "", source, destination)).to eq(true)
+ expect(File.read(destination)).to eq("testing")
+ end
end
end
end
+
context "when scheme is 'nfs'" do
end
context "when scheme is 'cifs'" do
