Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 75 additions & 14 deletions rust/agama-software/src/model/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -296,20 +296,37 @@ impl<'a> SoftwareStateBuilder<'a> {

fn from_product_spec(&self) -> SoftwareState {
let software = &self.product.software;
let repositories = software
.repositories()
.into_iter()
.enumerate()
.map(|(i, r)| {
let alias = format!("agama-{}", i);
Repository {
name: alias.clone(),
alias,
url: r.url.clone(),
enabled: true,
}
})
.collect();
let kernel_repos = self.kernel_cmdline.get_last("inst.install_url");
let repositories = if let Some(kernel_repos) = kernel_repos {
kernel_repos
.split(",")
.enumerate()
.map(|(i, url)| {
let alias = format!("agama-{}", i);
Repository {
name: alias.clone(),
alias: alias,
url: url.to_string(),
enabled: true,
}
})
.collect()
} else {
software
.repositories()
.into_iter()
.enumerate()
.map(|(i, r)| {
let alias = format!("agama-{}", i);
Repository {
name: alias.clone(),
alias,
url: r.url.clone(),
enabled: true,
}
})
.collect()
};

let mut resolvables = ResolvablesState::default();
for pattern in &software.mandatory_patterns {
Expand Down Expand Up @@ -982,4 +999,48 @@ mod tests {
))
);
}

#[test]
fn test_repositories_from_kernel_cmdline() {
let product = build_product_spec("tumbleweed");
let kernel_cmdline = KernelCmdline::parse_str(
"inst.install_url=http://example.com/repo1,http://example.com/repo2",
);

let state = SoftwareStateBuilder::for_product(&product)
.with_kernel_cmdline(kernel_cmdline)
.build();

assert_eq!(state.repositories.len(), 2);
assert_eq!(state.repositories[0].url, "http://example.com/repo1");
assert_eq!(state.repositories[0].alias, "agama-0");
assert_eq!(state.repositories[1].url, "http://example.com/repo2");
assert_eq!(state.repositories[1].alias, "agama-1");
}

#[test]
fn test_single_repository_from_kernel_cmdline() {
let product = build_product_spec("tumbleweed");
let kernel_cmdline = KernelCmdline::parse_str("inst.install_url=http://example.com/repo1");

let state = SoftwareStateBuilder::for_product(&product)
.with_kernel_cmdline(kernel_cmdline)
.build();

assert_eq!(state.repositories.len(), 1);
assert_eq!(state.repositories[0].url, "http://example.com/repo1");
assert_eq!(state.repositories[0].alias, "agama-0");
}

#[test]
fn test_repositories_fallback_to_product() {
let product = build_product_spec("tumbleweed");
let kernel_cmdline = KernelCmdline::default();

let state = SoftwareStateBuilder::for_product(&product)
.with_kernel_cmdline(kernel_cmdline)
.build();

assert_eq!(state.repositories.len(), 3);
}
}
Loading