Add feature to pulp-glue check, also remove check from CLI

pulp · May 17, 2024 · 2b5e2c7 · 2b5e2c7
1 parent 055e113
commit 2b5e2c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pulp-glue/pulp_glue/rpm/context.py b/pulp-glue/pulp_glue/rpm/context.py
@@ -96,7 +96,12 @@ def preprocess_entity(self, body: EntityDefinition, partial: bool = False) -> En
                 PulpException(_("--relative-path must be provided"))
         contains_startswith = ["name__contains", "name__startswith", "release__contains", "release__startswith", "arch__contains", "arch__startswith"]
         if any(k in body for k in contains_startswith):
-            self.pulp_ctx.needs_plugin(PluginRequirement("rpm", specifier = ">=3.20.0"))
+            self.pulp_ctx.needs_plugin(
+                PluginRequirement(
+                    "rpm", 
+                    specifier = ">=3.20.0",
+                    feature = _("substring filters")
+                ))
         return body
 
 

diff --git a/pulpcore/cli/rpm/content.py b/pulpcore/cli/rpm/content.py
@@ -113,15 +113,13 @@ def content() -> None:
     pulp_option("--arch", allowed_with_contexts=(PulpRpmPackageContext,)),
     pulp_option(
         "--arch-contains", "arch__contains", allowed_with_contexts=(PulpRpmPackageContext,),
-        needs_plugins=[PluginRequirement("rpm", specifier=">=3.20.0")],
     ),
     pulp_option(
         "--arch-in", "arch__in", multiple=True, allowed_with_contexts=(PulpRpmPackageContext,)
     ),
     pulp_option("--arch-ne", "arch__ne", allowed_with_contexts=(PulpRpmPackageContext,)),
     pulp_option(
         "--arch-startswith", "arch__startswith", allowed_with_contexts=(PulpRpmPackageContext,),
-        needs_plugins=[PluginRequirement("rpm", specifier=">=3.20.0")],
     ),
     pulp_option("--epoch", allowed_with_contexts=(PulpRpmPackageContext,)),
     pulp_option(
@@ -144,7 +142,6 @@ def content() -> None:
         "--name-contains",
         "name__contains",
         allowed_with_contexts=(PulpRpmPackageContext, PulpRpmModulemdContext),
-        needs_plugins=[PluginRequirement("rpm", specifier=">=3.20.0")],
     ),
     pulp_option(
         "--name-in",
@@ -161,7 +158,6 @@ def content() -> None:
         "--name-startswith",
         "name__startswith",
         allowed_with_contexts=(PulpRpmPackageContext, PulpRpmModulemdContext),
-        needs_plugins=[PluginRequirement("rpm", specifier=">=3.20.0")],
     ),
     pulp_option("--package-href", allowed_with_contexts=(PulpRpmPackageContext,)),
     pulp_option("--pkgId", allowed_with_contexts=(PulpRpmPackageContext,)),
@@ -174,7 +170,6 @@ def content() -> None:
     pulp_option("--release", allowed_with_contexts=(PulpRpmPackageContext,)),
     pulp_option(
         "--release-contains", "release__contains", allowed_with_contexts=(PulpRpmPackageContext,),
-        needs_plugins=[PluginRequirement("rpm", specifier=">=3.20.0")],
     ),
     pulp_option(
         "--release-in", "release__in", multiple=True, allowed_with_contexts=(PulpRpmPackageContext,)
@@ -184,7 +179,6 @@ def content() -> None:
         "--release-startswith",
         "release__startswith",
         allowed_with_contexts=(PulpRpmPackageContext,),
-        needs_plugins=[PluginRequirement("rpm", specifier=">=3.20.0")],
     ),
     pulp_option("--severity", allowed_with_contexts=(PulpRpmAdvisoryContext,)),
     pulp_option(