Commits

David Douard committed c4cc1d5

pushkey: properly handle abort during obsolete markers push

Comments (0)

Files changed (1)

     data = base85.b85decode(new)
     lock = repo.lock()
     try:
-        repo.obsstore.mergemarkers(data)
-        return 1
+        try:
+            repo.obsstore.mergemarkers(data)
+            return 1
+        except util.Abort:
+            return 0
     finally:
         lock.release()