Compare commits
2 commits
5fe4a0e864
...
6c0aa0abdd
Author | SHA1 | Date | |
---|---|---|---|
6c0aa0abdd | |||
d11af2fd99 |
1 changed files with 19 additions and 4 deletions
23
update.py
23
update.py
|
@ -709,7 +709,7 @@ def get_pkgbuild_version(
|
||||||
'ERROR: Failed to get dep "{}"'.format(dep),
|
'ERROR: Failed to get dep "{}"'.format(dep),
|
||||||
other_state=other_state,
|
other_state=other_state,
|
||||||
)
|
)
|
||||||
sys.exit(1)
|
return False, None, None, None
|
||||||
command_list.insert(2, "-I")
|
command_list.insert(2, "-I")
|
||||||
command_list.insert(3, dep_fullpath)
|
command_list.insert(3, dep_fullpath)
|
||||||
for aur_dep in pkg_state[pkg]["aur_deps"]:
|
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),
|
'ERROR: Failed to get aur_dep "{}"'.format(aur_dep),
|
||||||
other_state=other_state,
|
other_state=other_state,
|
||||||
)
|
)
|
||||||
sys.exit(1)
|
return False, None, None, None
|
||||||
command_list.insert(2, "-I")
|
command_list.insert(2, "-I")
|
||||||
command_list.insert(3, aur_dep_fullpath)
|
command_list.insert(3, aur_dep_fullpath)
|
||||||
subprocess.run(
|
subprocess.run(
|
||||||
|
@ -1245,6 +1245,7 @@ def update_pkg_list(
|
||||||
"--log",
|
"--log",
|
||||||
"--holdver",
|
"--holdver",
|
||||||
]
|
]
|
||||||
|
failure = False
|
||||||
for dep in pkg_state[pkg]["other_deps"]:
|
for dep in pkg_state[pkg]["other_deps"]:
|
||||||
dep_fullpath = get_latest_pkg(dep, "/var/cache/pacman/pkg")
|
dep_fullpath = get_latest_pkg(dep, "/var/cache/pacman/pkg")
|
||||||
if not dep_fullpath:
|
if not dep_fullpath:
|
||||||
|
@ -1252,9 +1253,12 @@ def update_pkg_list(
|
||||||
'ERROR: Failed to get dep "{}"'.format(dep),
|
'ERROR: Failed to get dep "{}"'.format(dep),
|
||||||
other_state=other_state,
|
other_state=other_state,
|
||||||
)
|
)
|
||||||
sys.exit(1)
|
failure = True
|
||||||
|
break
|
||||||
command_list.insert(2, "-I")
|
command_list.insert(2, "-I")
|
||||||
command_list.insert(3, dep_fullpath)
|
command_list.insert(3, dep_fullpath)
|
||||||
|
if failure:
|
||||||
|
continue
|
||||||
for aur_dep in pkg_state[pkg]["aur_deps"]:
|
for aur_dep in pkg_state[pkg]["aur_deps"]:
|
||||||
aur_dep_fullpath = get_latest_pkg(
|
aur_dep_fullpath = get_latest_pkg(
|
||||||
aur_dep, other_state["pkg_out_dir"]
|
aur_dep, other_state["pkg_out_dir"]
|
||||||
|
@ -1264,9 +1268,12 @@ def update_pkg_list(
|
||||||
'ERROR: Failed to get aur_dep "{}"'.format(aur_dep),
|
'ERROR: Failed to get aur_dep "{}"'.format(aur_dep),
|
||||||
other_state=other_state,
|
other_state=other_state,
|
||||||
)
|
)
|
||||||
sys.exit(1)
|
failure = True
|
||||||
|
break
|
||||||
command_list.insert(2, "-I")
|
command_list.insert(2, "-I")
|
||||||
command_list.insert(3, aur_dep_fullpath)
|
command_list.insert(3, aur_dep_fullpath)
|
||||||
|
if failure:
|
||||||
|
continue
|
||||||
if "ccache_dir" in pkg_state[pkg]:
|
if "ccache_dir" in pkg_state[pkg]:
|
||||||
command_list.insert(2, "-d")
|
command_list.insert(2, "-d")
|
||||||
command_list.insert(3, f'{pkg_state[pkg]["ccache_dir"]}:/ccache')
|
command_list.insert(3, f'{pkg_state[pkg]["ccache_dir"]}:/ccache')
|
||||||
|
@ -1609,6 +1616,14 @@ def test_gpg_passphrase(
|
||||||
tempnf.write(b"Test file content")
|
tempnf.write(b"Test file content")
|
||||||
tempnf.flush()
|
tempnf.flush()
|
||||||
try:
|
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(
|
subprocess.run(
|
||||||
(
|
(
|
||||||
"/usr/bin/env",
|
"/usr/bin/env",
|
||||||
|
|
Loading…
Reference in a new issue