|
|
@@ -162,16 +162,16 @@ public class System : Object {
|
|
|
}
|
|
|
|
|
|
if(usm_names.length > 0) {
|
|
|
- Log.info(@"Installing USM packages: $(string.joinv(" ", usm_names.to_array()))");
|
|
|
+ Log.info(@"Installing USM packages: $(string.joinv(" ", Argv.from_vector(usm_names)))");
|
|
|
var arguments = new Vector<string>();
|
|
|
arguments.add("install");
|
|
|
arguments.add("-y");
|
|
|
arguments.add_all(usm_names);
|
|
|
- yield run_usm_async(arguments.to_array());
|
|
|
+ yield run_usm_async(Argv.from_vector(arguments));
|
|
|
}
|
|
|
|
|
|
if(spm_names.length > 0) {
|
|
|
- Log.info(@"Installing system packages: $(string.joinv(" ", spm_names.to_array()))");
|
|
|
+ Log.info(@"Installing system packages: $(string.joinv(" ", Argv.from_vector(spm_names)))");
|
|
|
var system_installed = false;
|
|
|
try {
|
|
|
system_installed = yield spm.install(spm_names, event => log_install_progress(event));
|
|
|
@@ -180,15 +180,21 @@ public class System : Object {
|
|
|
throw new RadError.DEPLOY(@"Could not run the system package manager install: $(e.message)");
|
|
|
}
|
|
|
if(!system_installed) {
|
|
|
- throw new RadError.DEPLOY(@"The system package manager failed to install: $(string.joinv(" ", spm_names.to_array()))");
|
|
|
+ throw new RadError.DEPLOY(@"The system package manager failed to install: $(string.joinv(" ", Argv.from_vector(spm_names)))");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var recheck = new Usm.ResourceFinder();
|
|
|
var unmet = missing.where(r => !recheck.has_resource(r)).to_vector();
|
|
|
if(unmet.length > 0) {
|
|
|
- var listing = string.joinv(", ", unmet.select<string>(r => r.to_string()).to_array());
|
|
|
- throw new RadError.DEPENDENCY(@"Dependencies not satisfied after installation: $listing");
|
|
|
+ var listing = new StringBuilder();
|
|
|
+ foreach(var dependency in unmet) {
|
|
|
+ if(listing.len > 0) {
|
|
|
+ listing.append(", ");
|
|
|
+ }
|
|
|
+ listing.append(dependency.to_string());
|
|
|
+ }
|
|
|
+ throw new RadError.DEPENDENCY(@"Dependencies not satisfied after installation: $(listing.str)");
|
|
|
}
|
|
|
}
|
|
|
|