diff --git a/advisors/oa_upgradable.py b/advisors/oa_upgradable.py index cde171fa22f74e51f5bea3b3cbe91b168e6dad71..3393b29af973945b5d16f19ab4b63aee8350711d 100755 --- a/advisors/oa_upgradable.py +++ b/advisors/oa_upgradable.py @@ -141,6 +141,7 @@ def main_process(push, default, repo): print("Latest version is", ver_rec.latest_version) print("Maintain version is", ver_rec.maintain_version) + print("Newer Versions are", ver_rec.newer_versions) if cur_version != ver_rec.latest_version: if push: diff --git a/advisors/version_recommend.py b/advisors/version_recommend.py index bd853b9c9515d3781eba5d66880c442fff7ba682..970ba0476bdb6cbbb15e022ef88d338b52fd98a5 100755 --- a/advisors/version_recommend.py +++ b/advisors/version_recommend.py @@ -81,6 +81,13 @@ class VersionType(object): _ = version_entry, pkg_type return current_version + def newer_versions(self, version_entry, current_version): + candidate_versions = [] + for version in version_entry: + if self.compare(version, current_version) == 1: + candidate_versions.append(version) + return candidate_versions + def compare(self, _z1, _z2): """ Get the max version. @@ -119,6 +126,7 @@ class VersionType(object): if int(_d1[index]) < int(_d2[index]): result = -1 break + continue if _d1[index].isdigit(): result = 1 @@ -696,6 +704,7 @@ class VersionRecommend(object): print('version type = ', self.version_type.get_version_mode()) self.latest_version = self._get_latest_version(version_entry) self.maintain_version = self._get_maintain_version(version_entry, current_version, pkg_type) + self.newer_versions = self._get_newer_versions(version_entry, current_version) def version_match(self, version_entry): """ @@ -783,3 +792,8 @@ class VersionRecommend(object): if self.version_type is None: return '' return self.version_type.maintain_version(version_entry, current_version, pkg_type) + + def _get_newer_versions(self, version_entry, current_version): + if self.version_type is None: + return '' + return self.version_type.newer_versions(version_entry, current_version) diff --git a/ddd.txt b/ddd.txt new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/recommend.sh b/recommend.sh new file mode 100644 index 0000000000000000000000000000000000000000..965ef33ca6dc66e82c5545169ca0f8190975dd31 --- /dev/null +++ b/recommend.sh @@ -0,0 +1,4 @@ +#!/bin/sh +source ./develop_env.sh && cd advisors/ && python3 oa_upgradable.py $1 + +