chunking: Fix specific component file allocation

This fixes the bug where the specific layers were looking at the wrong
meta object to allocate files to the layer.

Signed-off-by: ckyrouac <ckyrouac@redhat.com>

Author: ckyrouac

crates/ostree-ext/src/chunking.rs

@@ -310,21 +310,23 @@ impl Chunking {
             return Ok(());
         }
 
-        // Reverses `contentmeta.map` i.e. contentid -> Vec<checksum>
-        let mut rmap = IndexMap::<ContentID, Vec<&String>>::new();
-        for (checksum, contentid) in meta.map.iter() {
-            rmap.entry(Rc::clone(contentid)).or_default().push(checksum);
-        }
-
         // Create exclusive chunks first if specified
         let mut processed_specific_components = BTreeSet::new();
         if let Some(specific_meta) = specific_contentmeta {
+            let mut specific_map = IndexMap::<ContentID, Vec<&String>>::new();
+            for (checksum, contentid) in specific_meta.map.iter() {
+                specific_map
+                    .entry(Rc::clone(contentid))
+                    .or_default()
+                    .push(checksum);
+            }
+
             for component in &specific_meta.sizes {
                 let mut chunk = Chunk::new(&component.meta.name);
                 chunk.packages = vec![component.meta.name.to_string()];
 
                 // Move all objects belonging to this exclusive component
-                if let Some(objects) = rmap.get(&component.meta.identifier) {
+                if let Some(objects) = specific_map.get(&component.meta.identifier) {
                     for &obj in objects {
                         self.remainder.move_obj(&mut chunk, obj);
                     }
@@ -353,6 +355,12 @@ impl Chunking {
             .cloned()
             .collect();
 
+        // Reverses `contentmeta.map` i.e. contentid -> Vec<checksum>
+        let mut rmap = IndexMap::<ContentID, Vec<&String>>::new();
+        for (checksum, contentid) in meta.map.iter() {
+            rmap.entry(Rc::clone(contentid)).or_default().push(checksum);
+        }
+
         // Process regular components with bin packing if we have remaining layers
         if let Some(remaining) = NonZeroU32::new(self.remaining()) {
             let start = Instant::now();