Skip to content

Check continuation block to detect Rock Ridge version #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Check continuation block to detect Rock Ridge version #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pycdlib/pycdlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,8 +1052,6 @@ def _walk_directories(self, vd, extent_to_ptr, extent_to_inode,
dir_record)
offset += lenbyte

self._set_rock_ridge(rr)

# Cache some properties of this record for later use.
is_symlink = new_record.is_symlink()
dots = new_record.is_dot() or new_record.is_dotdot()
Expand Down Expand Up @@ -1115,6 +1113,7 @@ def _walk_directories(self, vd, extent_to_ptr, extent_to_inode,
# will eventually be used to fix the PVD size.
lastbyte = max(lastbyte, new_end)

rr_ce = ''
if new_record.rock_ridge is not None and new_record.rock_ridge.dr_entries.ce_record is not None:
ce_record = new_record.rock_ridge.dr_entries.ce_record
orig_pos = cdfp.tell()
Expand All @@ -1130,6 +1129,12 @@ def _walk_directories(self, vd, extent_to_ptr, extent_to_inode,
ce_record.len_cont_area)
new_record.rock_ridge.update_ce_block(block)

rr_ce = new_record.rock_ridge.rr_version if new_record.rock_ridge else ''
# The PX record could be in the continuation blob, so
# the continuation is relevant to determine the actual
# Rock Ridge version
self._set_rock_ridge(max(rr, rr_ce))

if rr_cl:
child_links.append(new_record)

Expand Down