zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Typos: funciton, woudl, hm,... (#11511)

Browse Source
This commit is contained in:
George Hartzell 2019-05-18 09:39:23 -07:00 committed by Adam J. Stewart
parent 9957093e53
commit e592262da8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/version.py
View File

@ -38,7 +38,7 @@
# Valid version characters # Valid version characters
VALID_VERSION = r'[A-Za-z0-9_.-]' VALID_VERSION = r'[A-Za-z0-9_.-]'
# Infinity-like versions. The order in the list implies the comparision rules # Infinity-like versions. The order in the list implies the comparison rules
infinity_versions = ['develop', 'master', 'head', 'trunk'] infinity_versions = ['develop', 'master', 'head', 'trunk']
@ -467,7 +467,7 @@ def satisfies(self, other):
This is essentially the same as overlaps(), but overlaps assumes This is essentially the same as overlaps(), but overlaps assumes
that its arguments are specific. That is, 4.7 is interpreted as that its arguments are specific. That is, 4.7 is interpreted as
4.7.0.0.0.0... . This funciton assumes that 4.7 woudl be satisfied 4.7.0.0.0.0... . This function assumes that 4.7 would be satisfied
by 4.7.3.5, etc. by 4.7.3.5, etc.
Rationale: Rationale:
@ -549,7 +549,7 @@ def intersection(self, other):
# This is tricky: # This is tricky:
# 1.6.5 in 1.6 = True (1.6.5 is more specific) # 1.6.5 in 1.6 = True (1.6.5 is more specific)
# 1.6 < 1.6.5 = True (lexicographic) # 1.6 < 1.6.5 = True (lexicographic)
# Should 1.6 NOT be less than 1.6.5? Hm. # Should 1.6 NOT be less than 1.6.5? Hmm.
# Here we test (not end in other.end) first to avoid paradox. # Here we test (not end in other.end) first to avoid paradox.
if other.end is not None and end not in other.end: if other.end is not None and end not in other.end:
if other.end < end or other.end in end: if other.end < end or other.end in end: