From 478699829a192fa2f0a69d8da65d43644b5138fc Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Sun, 19 Jan 2025 16:03:14 -0800 Subject: [PATCH] libfetchers: fix trivial switcheroo of FileInputScheme and TarballInputScheme These are only called when registering the schemes, so reordering them to the previous order should ensure identical behaviour. Change-Id: I12ea0e18e6dc897a91ad20cea3a765c0b96ae85e --- lix/libfetchers/fetchers.cc | 2 +- lix/libfetchers/tarball.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lix/libfetchers/fetchers.cc b/lix/libfetchers/fetchers.cc index 125c8772a..9434dfb6f 100644 --- a/lix/libfetchers/fetchers.cc +++ b/lix/libfetchers/fetchers.cc @@ -19,8 +19,8 @@ void initLibFetchers() { registerInputScheme(makeIndirectInputScheme()); registerInputScheme(makePathInputScheme()); - registerInputScheme(makeFileInputScheme()); registerInputScheme(makeTarballInputScheme()); + registerInputScheme(makeFileInputScheme()); registerInputScheme(makeGitInputScheme()); registerInputScheme(makeMercurialInputScheme()); registerInputScheme(makeGitHubInputScheme()); diff --git a/lix/libfetchers/tarball.cc b/lix/libfetchers/tarball.cc index 06b3e17f2..2b208c99d 100644 --- a/lix/libfetchers/tarball.cc +++ b/lix/libfetchers/tarball.cc @@ -310,12 +310,12 @@ struct TarballInputScheme : CurlInputScheme std::unique_ptr makeFileInputScheme() { - return std::make_unique(); + return std::make_unique(); } std::unique_ptr makeTarballInputScheme() { - return std::make_unique(); + return std::make_unique(); } }