feat(oma-refresh): add Deb822 sources.list support

AOSC-Dev · May 5, 2024 · cec0b38 · cec0b38
1 parent 101f37b
commit cec0b38
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/oma-refresh/Cargo.toml b/oma-refresh/Cargo.toml
@@ -16,7 +16,7 @@ tokio = { version = "1.28", default_features = false, features = ["fs"] }
 serde_yaml = "0.9"
 once_cell = "1.18"
 futures = "0.3"
-oma-apt-sources-lists = "0.2"
+oma-apt-sources-lists = "0.3"
 oma-debcontrol = "0.3"
 sequoia-openpgp = { version = "1.20", default-features = false }
 anyhow = "1.0"

diff --git a/oma-refresh/src/db.rs b/oma-refresh/src/db.rs
@@ -159,9 +159,18 @@ pub fn get_sources<P: AsRef<Path>>(sysroot: P) -> Result<Vec<OmaSourceEntry>> {
     let list = SourcesLists::scan_from_root(sysroot).map_err(RefreshError::ScanSourceError)?;
 
     for file in list.iter() {
-        for i in &file.lines {
-            if let SourceLine::Entry(entry) = i {
-                res.push(OmaSourceEntry::new(entry)?);
+        match file.entries {
+            oma_apt_sources_lists::SourceListType::SourceLine(ref lines) => {
+                for i in lines {
+                    if let SourceLine::Entry(entry) = i {
+                        res.push(OmaSourceEntry::new(&entry)?);
+                    }
+                }
+            }
+            oma_apt_sources_lists::SourceListType::Deb822(ref e) => {
+                for i in &e.entries {
+                    res.push(OmaSourceEntry::new(&i)?);
+                }
             }
         }
     }