FIX config-lock release early regression caused by gitpython-developers#519

ankostis · ankostis · commit 8a01ec439e19 · 2016-10-03T00:37:37.000+02:00
+ Regression introduced in d84b960, by a wrong comment interpretation.
diff --git a/git/config.py b/git/config.py
@@ -479,20 +479,15 @@ def write(self):
         is_file_lock = isinstance(fp, string_types + (FileType, ))
         if is_file_lock:
             self._lock._obtain_lock()
-        try:
-            if not hasattr(fp, "seek"):
-                with open(self._file_or_files, "wb") as fp:
-                    self._write(fp)
-            else:
-                fp.seek(0)
-                # make sure we do not overwrite into an existing file
-                if hasattr(fp, 'truncate'):
-                    fp.truncate()
+        if not hasattr(fp, "seek"):
+            with open(self._file_or_files, "wb") as fp:
                 self._write(fp)
-        finally:
-            # we release the lock - it will not vanish automatically in PY3.5+
-            if is_file_lock:
-                self._lock._release_lock()
+        else:
+            fp.seek(0)
+            # make sure we do not overwrite into an existing file
+            if hasattr(fp, 'truncate'):
+                fp.truncate()
+            self._write(fp)
 
     def _assure_writable(self, method_name):
         if self.read_only:
