Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-04 14:29:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly configure changed optional dependencies (#1144)

Browse Source 
* add logic to accept optional dependency list and determine dependencies based on new service configurations

* add debugs

* properly extend iterator
This commit is contained in:
Lucy C
2022-01-28 12:55:27 -07:00
committed by GitHub
parent 6dea3c723e
commit b13911ec12
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
system-images/compat/src/main.rs
View File

@@ -74,6 +74,10 @@ fn inner_main() -> Result<(), anyhow::Error> {
Arg::with_name("assets")
.help("Path to the rules file")
.required(true),
)
.arg(
Arg::with_name("dependencies")
.help("Path to rules for optional dependency config")
),
),
)
@@ -190,11 +194,13 @@ fn inner_main() -> Result<(), anyhow::Error> {
};
let rules_path = Path::new(sub_m.value_of("assets").unwrap());
let name = sub_m.value_of("package_id").unwrap();
let deps_path = sub_m.value_of("dependencies");
match validate_configuration(
&name,
config,
rules_path,
&cfg_path.join("config.yaml"),
deps_path,
) {
Ok(a) => {
serde_yaml::to_writer(stdout(), &a)?;
@@ -304,7 +310,7 @@ fn inner_main() -> Result<(), anyhow::Error> {
let stats: serde_json::Value = if stats_path.exists() {
serde_yaml::from_reader(File::open(stats_path).unwrap()).unwrap()
} else {
let fallbackMessage: &str = sub_m
let fallback_message: &str = sub_m
.value_of("fallbackMessage")
.unwrap_or_else(|| PROPERTIES_FALLBACK_MESSAGE);
json!({
@@ -312,7 +318,7 @@ fn inner_main() -> Result<(), anyhow::Error> {
"data": {
"Not Ready": {
"type": "string",
"value": fallbackMessage,
"value": fallback_message,
"qr": false,
"copyable": false,
"masked": false,