update.py

@@ -709,7 +709,7 @@ def get_pkgbuild_version(
                         'ERROR: Failed to get dep "{}"'.format(dep),
                         other_state=other_state,
                     )
-                    return False, None, None, None
+                    sys.exit(1)
                 command_list.insert(2, "-I")
                 command_list.insert(3, dep_fullpath)
             for aur_dep in pkg_state[pkg]["aur_deps"]:
@@ -721,7 +721,7 @@ def get_pkgbuild_version(
                         'ERROR: Failed to get aur_dep "{}"'.format(aur_dep),
                         other_state=other_state,
                     )
-                    return False, None, None, None
+                    sys.exit(1)
                 command_list.insert(2, "-I")
                 command_list.insert(3, aur_dep_fullpath)
             subprocess.run(
@@ -1245,7 +1245,6 @@ def update_pkg_list(
             "--log",
             "--holdver",
         ]
-        failure = False
         for dep in pkg_state[pkg]["other_deps"]:
             dep_fullpath = get_latest_pkg(dep, "/var/cache/pacman/pkg")
             if not dep_fullpath:
@@ -1253,12 +1252,9 @@ def update_pkg_list(
                     'ERROR: Failed to get dep "{}"'.format(dep),
                     other_state=other_state,
                 )
-                failure = True
-                break
+                sys.exit(1)
             command_list.insert(2, "-I")
             command_list.insert(3, dep_fullpath)
-        if failure:
-            continue
         for aur_dep in pkg_state[pkg]["aur_deps"]:
             aur_dep_fullpath = get_latest_pkg(
                 aur_dep, other_state["pkg_out_dir"]
@@ -1268,12 +1264,9 @@ def update_pkg_list(
                     'ERROR: Failed to get aur_dep "{}"'.format(aur_dep),
                     other_state=other_state,
                 )
-                failure = True
-                break
+                sys.exit(1)
             command_list.insert(2, "-I")
             command_list.insert(3, aur_dep_fullpath)
-        if failure:
-            continue
         if "ccache_dir" in pkg_state[pkg]:
             command_list.insert(2, "-d")
             command_list.insert(3, f'{pkg_state[pkg]["ccache_dir"]}:/ccache')
@@ -1616,14 +1609,6 @@ def test_gpg_passphrase(
         tempnf.write(b"Test file content")
         tempnf.flush()
         try:
-            # Clear gpg password cache so that incorrect passwords don't pass.
-            subprocess.run(
-                ("/usr/bin/env", "gpg-connect-agent", "reloadagent", "/bye"),
-                check=True,
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.DEVNULL,
-                env={"GNUPGHOME": signing_gpg_dir},
-            )
             subprocess.run(
                 (
                     "/usr/bin/env",