From e253cd97c6a8d55a5be19731d58769f4663ab2d1 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 6 Oct 2021 22:16:46 +0300
Subject: Add support for applying backward compatibility workarounds to
 packages.manifest file generated by rep-create

---
 bpkg/fetch-pkg.cxx | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'bpkg/fetch-pkg.cxx')

diff --git a/bpkg/fetch-pkg.cxx b/bpkg/fetch-pkg.cxx
index 6d9e921..64abb43 100644
--- a/bpkg/fetch-pkg.cxx
+++ b/bpkg/fetch-pkg.cxx
@@ -168,8 +168,14 @@ namespace bpkg
   pkg_repository_manifests
   pkg_fetch_repositories (const dir_path& d, bool iu)
   {
-    return fetch_manifest<pkg_repository_manifests> (
-      nullptr, d / repositories_file, iu).first;
+    pkg_repository_manifests r (
+      fetch_manifest<pkg_repository_manifests> (
+        nullptr, d / repositories_file, iu).first);
+
+    if (r.empty ())
+      r.emplace_back (repository_manifest ()); // Add the base repository.
+
+    return r;
   }
 
   pair<pkg_repository_manifests, string/*checksum*/>
@@ -184,9 +190,15 @@ namespace bpkg
     path& f (*u.path);
     f /= repositories_file;
 
-    return rl.remote ()
+    pair<pkg_repository_manifests, string> r (
+      rl.remote ()
       ? fetch_manifest<pkg_repository_manifests> (o, u, iu)
-      : fetch_manifest<pkg_repository_manifests> (&o, f, iu);
+      : fetch_manifest<pkg_repository_manifests> (&o, f, iu));
+
+    if (r.first.empty ())
+      r.first.emplace_back (repository_manifest ()); // Add the base repository.
+
+    return r;
   }
 
   pkg_package_manifests
-- 
cgit v1.1