Don't build from source from deprecated recipes

All the solver tests now pass!

Signed-off-by: J Robert Ray <[email protected]>

Author: jrray

crates/spk-solve/src/cdcl_solver/spk_provider.rs

@@ -39,7 +39,7 @@ use spk_schema::name::{OptNameBuf, PkgNameBuf};
 use spk_schema::prelude::{HasVersion, Named};
 use spk_schema::version::Version;
 use spk_schema::version_range::{parse_version_range, DoubleEqualsVersion, Ranged, VersionFilter};
-use spk_schema::{BuildIdent, Opt, Package, Recipe, Request, VersionIdent};
+use spk_schema::{BuildIdent, Deprecate, Opt, Package, Recipe, Request, VersionIdent};
 use spk_storage::RepositoryHandle;
 use tracing::{debug_span, Instrument};
 
@@ -124,6 +124,12 @@ impl SpkProvider {
             .find(|repo| repo.name() == ident.repository_name())
         {
             Some(repo) => match repo.read_recipe(&ident.clone().to_version_ident()).await {
+                Ok(recipe) if recipe.is_deprecated() => {
+                    return CanBuildFromSource::No(
+                        self.pool
+                            .intern_string(format!("recipe for {ident} is deprecated")),
+                    );
+                }
                 Ok(recipe) => recipe,
                 Err(err) => {
                     return CanBuildFromSource::No(

crates/spk-solve/src/solver_test.rs

@@ -1179,8 +1179,6 @@ async fn test_solver_deprecated_version(#[case] mut solver: SolverImpl) {
 
 #[rstest]
 #[case::og(og_solver())]
-// Remove #[should_panic] once cdcl handles this case
-#[should_panic]
 #[case::cdcl(cdcl_solver())]
 #[tokio::test]
 async fn test_solver_build_from_source_deprecated(#[case] mut solver: SolverImpl) {
@@ -1215,7 +1213,10 @@ async fn test_solver_build_from_source_deprecated(#[case] mut solver: SolverImpl
 
     let res = run_and_print_resolve_for_tests(&mut solver).await;
     match res {
+        // og solver's error
         Err(Error::GraphError(spk_solve_graph::Error::FailedToResolve(_))) => {}
+        // cdcl solver's error
+        Err(Error::FailedToResolve(_)) => {}
         Err(err) => {
             panic!("expected solver spk_solver_graph::Error::FailedToResolve, got: '{err:?}'")
         }