Resolve pylint message R1705
R1705: Unnecessary "else/elif" after "return"
Change-Id: I4a50ffafc6cadf1fa7f86930d0caf13d2646e1e7
diff --git a/container-images/gerrit-init/tools/git_config_parser.py b/container-images/gerrit-init/tools/git_config_parser.py
index 05076f2..935dd04 100644
--- a/container-images/gerrit-init/tools/git_config_parser.py
+++ b/container-images/gerrit-init/tools/git_config_parser.py
@@ -51,11 +51,8 @@
try:
value = self._get_value(key)[-1].lower()
- if value == "true":
- return True
- elif value == "false":
- return False
- else:
+ if value not in ["true", "false"]:
raise TypeError("Value is not a boolean.")
+ return value == "true"
except subprocess.CalledProcessError:
return default
diff --git a/container-images/gerrit-init/tools/validate_db.py b/container-images/gerrit-init/tools/validate_db.py
index dc3cff0..e846b3a 100755
--- a/container-images/gerrit-init/tools/validate_db.py
+++ b/container-images/gerrit-init/tools/validate_db.py
@@ -81,10 +81,8 @@
if os.path.isabs(self.name):
if self.name.endswith(suffix):
return self.name
- else:
- return self.name + suffix
- else:
- return os.path.join(self.site, "db", self.name) + suffix
+ return self.name + suffix
+ return os.path.join(self.site, "db", self.name) + suffix
def wait_for_db_server(self):
# Not required. H2 is an embedded database.
