add relver handling and re-enable newlines

Author: antheas

.github/workflows/online_test_deck.yml

@@ -56,8 +56,8 @@ jobs:
             Version: <version> (previous version: <previous>)
 
             Major Components:
-              - Kernel: <version:kernel>
-              - Gamescope: <version:gamescope>
+              - Kernel: <relver:kernel>
+              - Gamescope: <relver:gamescope>
               - KDE: <version:kwayland>
 
             Handheld Daemon:

3_chunk.sh

@@ -103,9 +103,11 @@ ostree-ext-cli \
     ${PREV_ARG} "${OUT_REF}"
 
 echo Created archive with ref ${OUT_REF}
-echo Writing manifests to ./$OUT_NAME.manifest.json, ./$OUT_NAME.manifest.raw.json
-skopeo inspect ${OUT_REF} > ${OUT_NAME}.manifest.json
-skopeo inspect --raw ${OUT_REF} > ${OUT_NAME}.manifest.raw.json
+
+# TODO: Temporarily remove to try newlines
+# echo Writing manifests to ./$OUT_NAME.manifest.json, ./$OUT_NAME.manifest.raw.json
+# skopeo inspect ${OUT_REF} > ${OUT_NAME}.manifest.json
+# skopeo inspect --raw ${OUT_REF} > ${OUT_NAME}.manifest.raw.json
 
 # Reset perms to make the files usable
 chmod 666 -R ${OUT_NAME}*

src/rechunk/fedora.py

@@ -22,7 +22,7 @@ def get_packages(dir: str):
             "rpm",
             "-qa",
             "--queryformat",
-            ">\n[%{FILESIZES} %{FILENAMES}\n]<%{NAME} %{NEVRA} %{VERSION}-%{RELEASE} %{SIZE}\n",
+            ">\n[%{FILESIZES} %{FILENAMES}\n]<%{NAME} %{NEVRA} %{VERSION} %{RELEASE} %{SIZE}\n",
             "--changes",
             "--dbpath",
             dir,
@@ -36,8 +36,11 @@ def get_packages(dir: str):
             name = data[0]
             nevra = data[1]
             version = data[2]
-            size = int(data[3])
-            package = Package(name, nevra, size, tuple(files), tuple(updates), version)
+            release = data[3]
+            size = int(data[4])
+            package = Package(
+                name, nevra, size, tuple(files), tuple(updates), version, release
+            )
             packages.append(package)
 
             files = []

src/rechunk/model.py

@@ -14,6 +14,7 @@ class Package(NamedTuple):
     files: tuple[File, ...] = tuple()
     updates: tuple[datetime, ...] = tuple()
     version: str = ""
+    release: str = ""
 
 class MetaPackage(NamedTuple):
     index: int

src/rechunk/utils.py

@@ -198,19 +198,25 @@ def get_labels(
                 value = value.replace("<pretty>", pretty)
             if "<previous>" in value and prev_version:
                 value = value.replace("<previous>", prev_version)
-            
+
             if base_pkg:
                 for pkg in base_pkg:
                     if not pkg.version:
                         continue
                     vkey = f"<version:{pkg.name}>"
                     if vkey in value:
                         value = value.replace(vkey, pkg.version)
+                    vkey = f"<relver:{pkg.name}>"
+                    if vkey in value:
+                        value = value.replace(
+                            vkey,
+                            (
+                                f"{pkg.version}-{pkg.release}"
+                                if pkg.release
+                                else pkg.version
+                            ),
+                        )
 
-            # OCI spec does not like new lines
-            value = value.replace('\n', '<br>')
-            value = value.replace('\r', '')
-            
             new_labels[key] = value
 
     if new_labels: