Capture errors in calls. Commit if merging.

jaraco · Aug 26, 2022 · 911e679 · 911e679
1 parent 7ab447f
commit 911e679
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/jaraco/develop/update-projects.py b/jaraco/develop/update-projects.py
@@ -17,17 +17,21 @@ def checkout(project):
     with path.TempDir() as dir:
         repo = dir / 'repo'
         repo.mkdir()
-        subprocess.Popen(['git', 'clone', url, repo]).wait()
+        subprocess.check_call(['git', 'clone', url, repo])
         with repo:
             yield
 
 
 def update_project(name):
     resolved = resolve(name)
+    print('\nupdating', name)
     with checkout(resolved):
-        subprocess.Popen(['git', 'pull', 'gh://jaraco/skeleton']).wait()
-        subprocess.Popen(['git', 'mergetool']).wait()
-        subprocess.Popen(['git', 'push']).wait()
+        proc = subprocess.Popen(['git', 'pull', 'gh://jaraco/skeleton'])
+        code = proc.wait()
+        if code:
+            subprocess.check_call(['git', 'mergetool'])
+            subprocess.check_call(['git', 'commit', '--no-edit'])
+        subprocess.check_call(['git', 'push'])
 
 
 @autocommand.autocommand(__name__)