aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bbot/agent/machine.cxx2
-rw-r--r--bbot/machine-manifest.cxx2
-rw-r--r--bbot/worker/worker.cxx14
3 files changed, 9 insertions, 9 deletions
diff --git a/bbot/agent/machine.cxx b/bbot/agent/machine.cxx
index 443ab28..8308989 100644
--- a/bbot/agent/machine.cxx
+++ b/bbot/agent/machine.cxx
@@ -415,7 +415,7 @@ namespace bbot
// RAM and CPU configuration.
//
- "-m", to_string (ram / 1024) + "M",
+ "-m", to_string (ram / 1024) + 'M',
"-smp", (to_string (cpus) +
",sockets=" + to_string (sockets) +
",cores=" + to_string (cores) +
diff --git a/bbot/machine-manifest.cxx b/bbot/machine-manifest.cxx
index 2b9f9a6..606baf0 100644
--- a/bbot/machine-manifest.cxx
+++ b/bbot/machine-manifest.cxx
@@ -41,7 +41,7 @@ namespace bbot
{
if (t == "kvm") return machine_type::kvm;
else if (t == "nspawn") return machine_type::nspawn;
- else throw invalid_argument ("invalid machine type '" + t + "'");
+ else throw invalid_argument ("invalid machine type '" + t + '\'');
}
// machine_manifest
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index e12ed9a..4b1a16d 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -500,7 +500,7 @@ run_cmd (step_id step,
if (!pr.wait ())
{
const process_exit& e (*pr.exit);
- add (name + " " + to_string (e));
+ add (name + ' ' + to_string (e));
r = e.normal () ? result_status::error : result_status::abnormal;
}
@@ -907,7 +907,7 @@ build (size_t argc, const char* argv[])
if (!bkp_step && !bkp_status)
{
fail_operation (add_result ("configure"),
- "invalid interactive build breakpoint '" + b + "'",
+ "invalid interactive build breakpoint '" + b + '\'',
result_status::abort);
break;
@@ -1428,7 +1428,7 @@ build (size_t argc, const char* argv[])
optional<string> bootstrap_import;
if (bootstrap)
- bootstrap_import = "!config.import." + pkg_var + "=" +
+ bootstrap_import = "!config.import." + pkg_var + '=' +
(rwd / main_pkg_conf).string ();
// Configure.
@@ -1628,7 +1628,7 @@ build (size_t argc, const char* argv[])
trace, r.log, wre,
bkp_step, bkp_status, last_cmd,
"-V",
- "create(" + module_conf.representation () + "," + mods + ")",
+ "create(" + module_conf.representation () + ',' + mods + ')',
"config.config.load=~build2",
"config.config.persist+='config.*'@unused=drop",
eas,
@@ -1676,7 +1676,7 @@ build (size_t argc, const char* argv[])
trace, r.log, wre,
bkp_step, bkp_status, last_cmd,
"-V",
- "create(" + install_conf.representation () + "," + mods + ")",
+ "create(" + install_conf.representation () + ',' + mods + ')',
"config.config.load=~build2",
"config.config.persist+='config.*'@unused=drop",
step_args (env_args, s),
@@ -2293,7 +2293,7 @@ build (size_t argc, const char* argv[])
}
else
fail_operation (r,
- "unexpected bpkg output:\n'" + s + "'",
+ "unexpected bpkg output:\n'" + s + '\'',
result_status::error);
}
@@ -2724,7 +2724,7 @@ build (size_t argc, const char* argv[])
trace, r.log, wre,
bkp_step, bkp_status, last_cmd,
"-V",
- "create('" + out_dir.representation () + "'" + mods + ")",
+ "create('" + out_dir.representation () + '\'' + mods + ')',
step_args (env_args, s, f),
step_args (config_args, s, f));