Commit 523c396c by Randy Döring

cleanup: use is_direct_origin method of Dependency instead of static method

parent 53e50d95
...@@ -151,10 +151,6 @@ class Term: ...@@ -151,10 +151,6 @@ class Term:
""" """
return self.intersect(other.inverse) return self.intersect(other.inverse)
@staticmethod
def _is_direct_origin(dependency: Dependency) -> bool:
return dependency.source_type in ["directory", "file", "url", "git"]
def _compatible_dependency(self, other: Dependency) -> bool: def _compatible_dependency(self, other: Dependency) -> bool:
return ( return (
self.dependency.is_root self.dependency.is_root
...@@ -164,8 +160,7 @@ class Term: ...@@ -164,8 +160,7 @@ class Term:
# we do this here to indicate direct origin dependencies are # we do this here to indicate direct origin dependencies are
# compatible with NVR dependencies # compatible with NVR dependencies
self.dependency.complete_name == other.complete_name self.dependency.complete_name == other.complete_name
and self._is_direct_origin(self.dependency) and self.dependency.is_direct_origin() != other.is_direct_origin()
!= self._is_direct_origin(other)
) )
) )
...@@ -178,8 +173,8 @@ class Term: ...@@ -178,8 +173,8 @@ class Term:
# when creating a new term prefer direct-reference dependencies # when creating a new term prefer direct-reference dependencies
dependency = ( dependency = (
other.dependency other.dependency
if not self._is_direct_origin(self.dependency) if not self.dependency.is_direct_origin()
and self._is_direct_origin(other.dependency) and other.dependency.is_direct_origin()
else self.dependency else self.dependency
) )
return Term(dependency.with_constraint(constraint), is_positive) return Term(dependency.with_constraint(constraint), is_positive)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment