freebsd backend: Start from meta.conf when gathering repository metad…

…ata.
ximion · Jan 30, 2024 · b8d5e9f · b8d5e9f
1 parent aa355cd
commit b8d5e9f
Showing 1 changed file with 26 additions and 3 deletions.
diff --git a/src/asgen/backends/freebsd/fbsdpkgindex.d b/src/asgen/backends/freebsd/fbsdpkgindex.d
@@ -59,17 +59,40 @@ public:
     private Package[] loadPackages (string suite, string section, string arch)
     {
         auto pkgRoot = buildPath (rootDir, suite);
-        auto listsTarFname = buildPath (pkgRoot, "packagesite.pkg");
+        auto metaFname = buildPath (pkgRoot, "meta.conf");
+        string manifestFname, manifestArchive;
+
+        if (!std.file.exists (metaFname)) {
+            logError ("Metadata file '%s' does not exist.", metaFname);
+            return [];
+        }
+
+        foreach(line; std.file.slurp!(string)(metaFname, "%s")) {
+            if (line.startsWith("manifests_archive")) {
+                // manifests_archive = "packagesite";
+                auto splitResult = line.split("\"");
+                if (splitResult.length == 3)
+                    manifestArchive = splitResult[1];
+            }
+            else if (line.startsWith("manifests")) {
+                // manifests = "packagesite.yaml";
+                auto splitResult = line.split("\"");
+                if (splitResult.length == 3)
+                    manifestFname = splitResult[1];
+            }
+        }
+
+        auto listsTarFname = buildPath (pkgRoot, manifestArchive ~ ".pkg");
         if (!std.file.exists (listsTarFname)) {
-            logWarning ("Package lists file '%s' does not exist.", listsTarFname);
+            logError ("Package lists file '%s' does not exist.", listsTarFname);
             return [];
         }
 
         ArchiveDecompressor ad;
         ad.open (listsTarFname);
         logDebug ("Opened: %s", listsTarFname);
 
-        auto d = ad.readData("packagesite.yaml");
+        auto d = ad.readData(manifestFname);
         auto pkgs = appender!(Package[]);
 
         foreach(entry; d.split('\n')) {