On Fri, Mar 05, 2021 at 03:30:23PM +0800, Cao Xueliang wrote:

On Fri, Mar 05, 2021 at 12:55:40PM +0800, Li Ping wrote:

...

[why] rpm has no much to do with os_mount.

Signed-off-by: Li Ping <1477412247@qq.com> --- src/lib/job.cr | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/lib/job.cr b/src/lib/job.cr index 0b4bee4..c07033c 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -267,14 +267,19 @@ class Job

pkg_style = JSON.parse("{}") if pkg_style == nil

- tmp_os = pkg_style["os"]? == nil ? "#{os}" : pkg_style["os"] - tmp_os_arch = pkg_style["os_arch"]? == nil ? "#{os_arch}" : pkg_style["os_arch"] - tmp_os_version = pkg_style["os_version"]? == nil ? "#{os_version}" : pkg_style["os_version"] + tmp_os = pkg_style["os"]? || "#{os}"

job.yaml cci-makepkg: os:

You will get the wrong tmp_os.

ok, i got it. Thanks, Ping

Thanks, Xueliang

...

+ tmp_os_arch = pkg_style["os_arch"]? || "#{os_arch}" + tmp_os_version = pkg_style["os_version"]? || "#{os_version}"

- tmp_os_mount = pkg_style["os_mount"]? == nil ? "#{os_mount}" : pkg_style["os_mount"] - mount_type = tmp_os_mount == "cifs" ? "nfs" : tmp_os_mount.dup + mount_type = pkg_style["os_mount"]? || "#{os_mount}" + # same usage for client + mount_type = "nfs" if mount_type == "cifs"

- common_dir = "#{mount_type}/#{tmp_os}/#{tmp_os_arch}/#{tmp_os_version}" + if @hash["rpmbuild-pkg"]? + common_dir = "#{tmp_os}/#{tmp_os_arch}/#{tmp_os_version}" + else + common_dir = "#{mount_type}/#{tmp_os}/#{tmp_os_arch}/#{tmp_os_version}" + end

return common_dir end -- 2.23.0