Skip to content
This repository was archived by the owner on Jun 4, 2025. It is now read-only.

Fix issue with .7 where 7zip extracts the file without the noarch%2F on it (Take2) #141

Merged
nalimilan merged 4 commits into from
Mar 31, 2018
Merged

Fix issue with .7 where 7zip extracts the file without the noarch%2F on it (Take2) #141

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb4317d
Search for just filename not name with %2F in it.
RandomString123 Feb 16, 2018
fffb0bf
Target to specific version when 7zip changed 0.7.0-DEV.2181
RandomString123 Feb 16, 2018
c60d652
Remove static macro
RandomString123 Feb 16, 2018
98878bd
switch to basename
RandomString123 Feb 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/WinRPM.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,13 @@ function do_install(package::Package)
write(f, data[1])
end
info("Extracting: ", name)
cpio = splitext(path2)[1]*".cpio"

@static if VERSION < v"0.7.0-DEV"
Copy link
Contributor

@tkelman tkelman Feb 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be specific to the merge commit that upgraded 7zip

Copy link
Contributor Author

@RandomString123 RandomString123 Feb 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree. but my newness to Julia means I need some help here. Is there an easy way to find that other than digging through hundreds of commits?

Copy link
Contributor

@tkelman tkelman Feb 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's a commit-name script in contrib of a julia checkout, run it on JuliaLang/julia@8153470

cpio = splitext(path2)[1]*".cpio"
else
cpio = splitext(joinpath(cache, escape(last(split(path, "/")))))[1] * ".cpio"
end

local err = nothing
for cmd = [`$exe7z x -y $path2 -o$cache`, `$exe7z x -y $cpio -o$installdir`]
(out, pc) = open(cmd, "r")
Expand Down