distro_info: read the YAML local series path, drop the dead dist_info stanza
This commit is contained in:
+3
-4
@@ -3,10 +3,9 @@
|
|||||||
## update and maintain such data in one unique place
|
## update and maintain such data in one unique place
|
||||||
## The goal is to have the minimal possible set of data necessary
|
## The goal is to have the minimal possible set of data necessary
|
||||||
## to grab the actual data. For example we don't want to store every Ubuntu
|
## to grab the actual data. For example we don't want to store every Ubuntu
|
||||||
## or Debian series, but rather an URL where we can properly access that data.
|
## or Debian series, but rather pointers to where that data lives: each dist
|
||||||
dist_info:
|
## entry below carries its series sources (the local distro-info CSV, with
|
||||||
local: /usr/share/distro-info/{dist}
|
## the network URL as fallback).
|
||||||
network: https://salsa.debian.org/debian/distro-info-data/-/raw/main/
|
|
||||||
dist:
|
dist:
|
||||||
debian:
|
debian:
|
||||||
base_url: https://deb.debian.org/debian
|
base_url: https://deb.debian.org/debian
|
||||||
|
|||||||
+1
-1
@@ -240,7 +240,7 @@ pub async fn get_ordered_series(dist: &str) -> Result<Vec<SeriesInformation>, Bo
|
|||||||
})?;
|
})?;
|
||||||
let series_info = &dist_data.series;
|
let series_info = &dist_data.series;
|
||||||
let content = if Path::new(series_info.local.as_str()).exists() {
|
let content = if Path::new(series_info.local.as_str()).exists() {
|
||||||
std::fs::read_to_string(format!("/usr/share/distro-info/{dist}.csv")).map_err(|e| {
|
std::fs::read_to_string(series_info.local.as_str()).map_err(|e| {
|
||||||
format!(
|
format!(
|
||||||
"Failed to read distribution series data for '{dist}' \
|
"Failed to read distribution series data for '{dist}' \
|
||||||
from '{}': {}. The 'distro-info' package provides these CSV files.",
|
from '{}': {}. The 'distro-info' package provides these CSV files.",
|
||||||
|
|||||||
Reference in New Issue
Block a user