diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-07-30 17:25:23 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-07-30 17:25:23 +0200 |
commit | b94b5381f68061121c22f2786ba1fa774f1ee6f6 (patch) | |
tree | 887717ac2e585c93141e71509f8779e852c4967d /bpkg/pkg-disfigure.cxx | |
parent | bee19e051ea565813588a532bfbae4ce0b2f4a71 (diff) |
Convert to use canonical directory separators
Diffstat (limited to 'bpkg/pkg-disfigure.cxx')
-rw-r--r-- | bpkg/pkg-disfigure.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/bpkg/pkg-disfigure.cxx b/bpkg/pkg-disfigure.cxx index cb3e657..de9b681 100644 --- a/bpkg/pkg-disfigure.cxx +++ b/bpkg/pkg-disfigure.cxx @@ -72,10 +72,13 @@ namespace bpkg // string bspec; + // Use path representation to get canonical trailing slash. + // + const string& rep (out_root.representation ()); + if (p->state == package_state::configured) { - bspec = "clean('" + out_root.string () + "/') " - "disfigure('" + out_root.string () + "/')"; + bspec = "clean('" + rep + "') " "disfigure('" + rep + "')"; } else { @@ -84,11 +87,10 @@ namespace bpkg // partially configured one. // if (src_root == out_root) - bspec = "disfigure('" + out_root.string () + "/')"; + bspec = "disfigure('" + rep + "')"; else - bspec = "disfigure('" + - src_root.string () + "/'@'" + - out_root.string () + "/')"; + bspec = "disfigure('" + src_root.representation () + "'@'" + + rep + "')"; } l4 ([&]{trace << "buildspec: " << bspec;}); |