Dark-Horse-Linux/dpm-core
1
0
Fork 0
Code Pull Requests Releases Activity

added target os conf fallback. arg > conf.

Browse Source
This commit is contained in:
Chris Punches
2025-03-14 02:57:22 -04:00
parent 558d9d2738
commit dd9ee891d4
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/system.conf Normal file
View File

@@ -0,0 +1,2 @@
[build]
osf=dhl

7
modules/build/src/commands.cpp
View File

@@ -25,13 +25,14 @@ int cmd_stage(int argc, char** argv) {
// If OS is not supplied, try to get it from config // If OS is not supplied, try to get it from config
if (options.os.empty()) { if (options.os.empty()) {
dpm_log( LOG_DEBUG, "Target OS not provided as a commandline argument.");
const char* config_os = dpm_get_config("build", "os"); const char* config_os = dpm_get_config("build", "os");
if (config_os != nullptr) { if (config_os != nullptr) {
options.os = config_os; options.os = config_os;
dpm_log(LOG_DEBUG, ("Using OS from config: " + options.os).c_str()); dpm_log(LOG_DEBUG, ("Using build.os from config: " + options.os).c_str());
} else { } else {
dpm_log(LOG_ERROR, "OS not specified and not found in configuration"); dpm_log(LOG_ERROR, "Target OS not specified and not found as build.os in configuration.");
dpm_log(LOG_ERROR, "Please specify OS with --os or set a default in /etc/dpm/conf.d/build.conf"); dpm_log(LOG_ERROR, "Please specify OS with --os or set a default at build.os in '/etc/dpm/conf.d/'.");
return 1; return 1;
} }
} }