pylint: enable inconsistent-return-statements

[bup.git] / lib / bup / git.py

diff --git a/lib/bup/git.py b/lib/bup/git.py
index cccc44ef97655f79a8755d65990c55edae1c1e02..ce8041a7be7e8cfaf26ced58edd0df7f5689847b 100644 (file)
--- a/lib/bup/git.py
+++ b/lib/bup/git.py
@@ -263,8 +263,7 @@ def demangle_name(name, mode):
     elif name.endswith(b'.bupm'):
         return (name[:-5],
                 BUP_CHUNKED if stat.S_ISDIR(mode) else BUP_NORMAL)
-    else:
-        return (name, BUP_NORMAL)
+    return (name, BUP_NORMAL)
 
 
 def calc_hash(type, content):
@@ -1269,6 +1268,7 @@ class CatPipe:
         if wait:
             p.wait()
             return p.returncode
+        return None
 
     def restart(self):
         self.close()