Skip to content

Commit

Permalink
Update replace to Julia 1.0 convention.
Browse files Browse the repository at this point in the history
More `replace` revisions.
  • Loading branch information
hessammehr committed Aug 21, 2018
1 parent 805ad80 commit 25c78bf
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/WinRPM.jl
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ function show(io::IO, pkg::Package)
println(io," Arch: ", LibExpat.string_value(pkg["arch"][1]))
println(io," URL: ", LibExpat.string_value(pkg["url"][1]))
println(io," License: ", LibExpat.string_value(pkg["format/rpm:license"][1]))
print(io," Description: ", replace(LibExpat.string_value(pkg["description"][1]), r"\r\n|\r|\n", "\n "))
print(io," Description: ", replace(LibExpat.string_value(pkg["description"][1]), r"\r\n|\r|\n" => "\n "))
end

function show(io::IO, pkgs::Packages)
Expand Down Expand Up @@ -417,7 +417,7 @@ function prepare_install(pkg::Union{Package,Packages})
end
toupdate = ETree[]
filter!(packages) do p
ver = replace(join(rpm_ver(p), ','), r"\s", "")
ver = replace(join(rpm_ver(p), ','), r"\s" => "")
oldver = false
for entry in p[xpath"format/rpm:provides/rpm:entry[@name]"]
provides = entry.attr["name"]
Expand Down Expand Up @@ -496,7 +496,7 @@ function do_install(package::Package)
end
end
isfile(cpio) && rm(cpio)
ver = replace(join(rpm_ver(package), ','), r"\s", "")
ver = replace(join(rpm_ver(package), ','), r"\s" => "")
open(installedlist, isfile(installedlist) ? "r+" : "w+") do installed
for entry in package[xpath"format/rpm:provides/rpm:entry[@name]"]
provides = entry.attr["name"]
Expand Down

0 comments on commit 25c78bf

Please sign in to comment.