Commit 322a5683 authored by Chris Lamb's avatar Chris Lamb 💬

Query the container for the full path of the parallel R .rdx file to the .rdb...

Query the container for the full path of the parallel R .rdx file to the .rdb file as well as looking in the same directory. This ensures that comparing two .deb/.changes shows a varying path mostly introduced in f1e80ca2.
parent 5c50c2de
Pipeline #81432 passed with stage
in 22 minutes and 21 seconds
......@@ -79,13 +79,19 @@ def get_module_path_for_rdb(rdb):
return
# Calculate location of parallel .rdx file
rdx_name = "{}.rdx".format(os.path.basename(os.path.splitext(rdb.name)[0]))
rdx_name = "{}.rdx".format(os.path.splitext(rdb.name)[0])
try:
# Query the container for the full path (eg. `./path/to/foo.rdx`)...
rdx = rdb.container.get_member(rdx_name)
except KeyError:
# Corresponding .rdx does not exist
return
try:
# ... falling back to looking in the same directory for when
# comparing two .rdb files directly
rdx = rdb.container.get_member(os.path.basename(rdx_name))
except KeyError:
# Corresponding .rdx does not exist
return
temp_dir = get_temporary_directory().name
prefix = os.path.join(temp_dir, "temp")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment