pkg-bootstrap doesn't fall through to lower-priority repos

[rincorvid]

I have a local repo with higher priority than the public one. When I run pkg bootstrap on 13.4-p4, I get this error:

[root@base-13_4 ~]# pkg bootstrap -y
Bootstrapping pkg from file:///var/db/pkgrepo/repos/FreeBSD:13:amd64/latest, please wait...
pkg: Error fetching file:///var/db/pkgrepo/repos/FreeBSD:13:amd64/latest/Latest/pkg.txz: No such file or directory
A pre-built version of pkg could not be found for your system.
Consider changing PACKAGESITE or installing it from ports: 'ports-mgmt/pkg'.

Things that work around this:

• grabbing a copy of the pkg pkg, adding it to my repo, and symlinking Latest/pkg.txz to it;
• adding -r FreeBSD to the command.

Normally, pkg will seemlessly fall through to the public repo for anything I don't have locally. Why doesn't pkg-bootstrap do the same?

[rincorvid]

My C is a bit rusty, but I think this diff between 13-STABLE and -CURRENT says it's already been fixed?

# git diff b5ae765d8244..HEAD usr.sbin/pkg/pkg.c
[very long diff trimmed]
@@ -1261,7 +1247,12 @@ main(int argc, char *argv[])
                        if (pkg_query_yes_no() == 0)
                                exit(EXIT_FAILURE);
                }
-               if (bootstrap_pkg(force, fetchOpts) != 0)
+               repositories = config_get_repositories();
+               STAILQ_FOREACH(repo, repositories, next) {
+                       if ((ret = bootstrap_pkg(force, fetchOpts, repo)) == 0)
+                               break;
+               }
+               if (ret != 0)

If so, can this be MFC'd?