6646 |
6646 |
6647 if VersionOnly.startswith("rev_"): |
6647 if VersionOnly.startswith("rev_"): |
6648 # installed from cloned sources, always newer |
6648 # installed from cloned sources, always newer |
6649 return True |
6649 return True |
6650 |
6650 |
6651 if "-snapshot-" in VersionOnly: |
6651 if "snapshot-" in VersionOnly: |
6652 # check snapshot version |
6652 # check snapshot version |
6653 if snapshot is None: |
6653 if snapshot is None: |
6654 return True |
6654 return True |
6655 else: |
6655 else: |
6656 vers = VersionOnly.split("-snapshot-")[1] |
6656 vers = VersionOnly.split("snapshot-")[1] |
6657 return vers > snapshot |
6657 return vers > snapshot |
6658 |
6658 |
6659 versionTuple = self.__versionToTuple(VersionOnly) |
6659 versionTuple = self.__versionToTuple(VersionOnly) |
6660 if isinstance(required, str): |
6660 if isinstance(required, str): |
6661 required = self.__versionToTuple(required) |
6661 required = self.__versionToTuple(required) |
6662 return versionTuple > required |
6662 try: |
|
6663 res = versionTuple > required |
|
6664 except TypeError: |
|
6665 # some mismatching types, assume newer |
|
6666 res = True |
|
6667 return res |
6663 |
6668 |
6664 def __versionToTuple(self, version): |
6669 def __versionToTuple(self, version): |
6665 """ |
6670 """ |
6666 Private method to convert a version string into a tuple. |
6671 Private method to convert a version string into a tuple. |
6667 |
6672 |