PATCH: Fix Conffiles corruption bug

Author: BoxingOctopus

Cargo.lock

@@ -6,7 +6,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.6.3"
+version = "0.6.4"
 edition = "2021"
 license = "Apache-2.0"
 authors = ["Ryan Draga <ryan.draga@boxingoctop.us>"]

Cargo.toml

@@ -130,6 +130,18 @@ fn format_stanza(fields: &BTreeMap<String, String>) -> String {
 }
 
 fn append_field(lines: &mut Vec<String>, key: &str, value: &str) {
+    // dpkg requires every Conffiles entry on a continuation line beginning with a space.
+    if key == "Conffiles" {
+        lines.push(format!("{key}:"));
+        for line in value.lines() {
+            let line = line.trim();
+            if !line.is_empty() {
+                lines.push(format!(" {line}"));
+            }
+        }
+        return;
+    }
+
     if !value.contains('\n') {
         lines.push(format!("{key}: {value}"));
         return;
@@ -172,4 +184,28 @@ mod tests {
             Some("line one\nline two")
         );
     }
+
+    #[test]
+    fn round_trips_conffiles_with_leading_space_lines() {
+        let content = "\
+Package: adduser
+Status: install ok installed
+Version: 3.137ubuntu1
+Architecture: all
+Conffiles:
+ /etc/adduser.conf deadbeef0123456789deadbeef0123456789
+ /etc/deluser.conf cafebabe0123456789cafebabe0123456789
+Description: add and remove users and groups
+";
+        let stanzas = parse_status_file(&format!("{content}\n")).unwrap();
+        let adduser = stanzas.get("adduser").unwrap();
+        let formatted = format_stanza(adduser);
+        assert!(formatted.contains("Conffiles:\n /etc/adduser.conf"));
+        assert!(!formatted.contains("Conffiles: /etc/"));
+        let reparsed = parse_stanza(&formatted).unwrap();
+        assert_eq!(
+            reparsed.get("Conffiles").map(String::as_str),
+            adduser.get("Conffiles").map(String::as_str)
+        );
+    }
 }

crates/raptor-core/src/dpkg_status.rs

@@ -316,6 +316,50 @@ mod tests {
         let _ = fs::remove_dir_all(&dir);
     }
 
+    #[test]
+    fn save_preserves_conffiles_format_for_other_packages() {
+        let dir = std::env::temp_dir().join(format!("raptor-dpkg-conffiles-{}", std::process::id()));
+        let _ = fs::remove_dir_all(&dir);
+        fs::create_dir_all(&dir).unwrap();
+        let path = dir.join("status");
+
+        fs::write(
+            &path,
+            "\
+Package: adduser
+Status: install ok installed
+Version: 3.137ubuntu1
+Architecture: all
+Conffiles:
+ /etc/adduser.conf deadbeef0123456789deadbeef0123456789
+Description: add and remove users
+
+Package: hello
+Status: install ok installed
+Version: 1.0
+Architecture: all
+Description: hi
+
+",
+        )
+        .unwrap();
+
+        let mut state = State::load(&path).unwrap();
+        state.install(&ControlFile {
+            package: "raptor".into(),
+            version: "0.6.3".into(),
+            architecture: "arm64".into(),
+            ..Default::default()
+        });
+        state.save().unwrap();
+
+        let saved = fs::read_to_string(&path).unwrap();
+        assert!(saved.contains("Conffiles:\n /etc/adduser.conf"));
+        assert!(!saved.contains("Conffiles: /etc/"));
+
+        let _ = fs::remove_dir_all(&dir);
+    }
+
     #[test]
     fn deb_architecture_maps_rust_targets() {
         assert_eq!(deb_architecture("x86_64"), "amd64");