summaryrefslogtreecommitdiffstats
path: root/repo
diff options
context:
space:
mode:
Diffstat (limited to 'repo')
-rwxr-xr-xrepo13
1 files changed, 6 insertions, 7 deletions
diff --git a/repo b/repo
index 98fd5f74..b2114e56 100755
--- a/repo
+++ b/repo
@@ -210,7 +210,6 @@ GIT = "git" # our git command
210# NB: The version of git that the repo launcher requires may be much older than 210# NB: The version of git that the repo launcher requires may be much older than
211# the version of git that the main repo source tree requires. Keeping this at 211# the version of git that the main repo source tree requires. Keeping this at
212# an older version also makes it easier for users to upgrade/rollback as needed. 212# an older version also makes it easier for users to upgrade/rollback as needed.
213# See requirements.json for versions.
214MIN_GIT_VERSION = (1, 7, 9) # minimum supported git version 213MIN_GIT_VERSION = (1, 7, 9) # minimum supported git version
215repodir = ".repo" # name of repo's private directory 214repodir = ".repo" # name of repo's private directory
216S_repo = "repo" # special repo repository 215S_repo = "repo" # special repo repository
@@ -1237,13 +1236,13 @@ class Requirements:
1237 1236
1238 return cls(json_data) 1237 return cls(json_data)
1239 1238
1240 def _get_soft_ver(self, pkg): 1239 def get_soft_ver(self, pkg):
1241 """Return the soft version for |pkg| if it exists.""" 1240 """Return the soft version for |pkg| if it exists."""
1242 return self.requirements.get(pkg, {}).get("soft", ()) 1241 return tuple(self.requirements.get(pkg, {}).get("soft", ()))
1243 1242
1244 def _get_hard_ver(self, pkg): 1243 def get_hard_ver(self, pkg):
1245 """Return the hard version for |pkg| if it exists.""" 1244 """Return the hard version for |pkg| if it exists."""
1246 return self.requirements.get(pkg, {}).get("hard", ()) 1245 return tuple(self.requirements.get(pkg, {}).get("hard", ()))
1247 1246
1248 @staticmethod 1247 @staticmethod
1249 def _format_ver(ver): 1248 def _format_ver(ver):
@@ -1253,8 +1252,8 @@ class Requirements:
1253 def assert_ver(self, pkg, curr_ver): 1252 def assert_ver(self, pkg, curr_ver):
1254 """Verify |pkg|'s |curr_ver| is new enough.""" 1253 """Verify |pkg|'s |curr_ver| is new enough."""
1255 curr_ver = tuple(curr_ver) 1254 curr_ver = tuple(curr_ver)
1256 soft_ver = tuple(self._get_soft_ver(pkg)) 1255 soft_ver = tuple(self.get_soft_ver(pkg))
1257 hard_ver = tuple(self._get_hard_ver(pkg)) 1256 hard_ver = tuple(self.get_hard_ver(pkg))
1258 if curr_ver < hard_ver: 1257 if curr_ver < hard_ver:
1259 print( 1258 print(
1260 f'repo: error: Your version of "{pkg}" ' 1259 f'repo: error: Your version of "{pkg}" '