Merge pull request #146 from webern/revert-force-upstream

buildsys: revert removal of force-upstream
bottlerocket-os · Jan 29, 2024 · 3a3bc9f · 3a3bc9f
2 parents 26888be + ab84c09
commit 3a3bc9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/tools/buildsys/src/cache.rs b/tools/buildsys/src/cache.rs
@@ -63,7 +63,7 @@ impl LookasideCache {
                 }
                 Err(e) => {
                     // next check with upstream, if permitted
-                    if upstream_fallback {
+                    if f.force_upstream.unwrap_or(false) || upstream_fallback {
                         println!("Error fetching from lookaside cache: {}", e);
                         println!("Fetching {:?} from upstream source", url_file_name);
                         Self::fetch_file(&f.url, &tmp, hash)?;

diff --git a/tools/buildsys/src/manifest.rs b/tools/buildsys/src/manifest.rs
@@ -566,6 +566,7 @@ pub struct ExternalFile {
     pub path: Option<PathBuf>,
     pub sha512: String,
     pub url: String,
+    pub force_upstream: Option<bool>,
     pub bundle_modules: Option<Vec<BundleModule>>,
     pub bundle_root_path: Option<PathBuf>,
     pub bundle_output_path: Option<PathBuf>,