almalinux/kiwi-el8
14
0
Fork 0
Code Issues Pull Requests Releases Activity

Only delete sub path if not empty

Browse Source
This commit is contained in:
Marcus Schäfer 2018-02-26 17:30:15 +01:00
parent 02203c6832
commit ccbbb48a36
No known key found for this signature in database
GPG Key ID: AD11DD02B44996EF
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kiwi/path.py
View File

@ -103,14 +103,17 @@ class Path(object):
]
for path_index in reversed(range(0, len(path_elements))):
sub_path = os.sep.join(path_elements[0:path_index])
if path_elements[path_index - 1] in protected_elements:
log.warning(
'remove_hierarchy: path {0} is protected'.format(sub_path)
if sub_path:
if path_elements[path_index - 1] in protected_elements:
log.warning(
'remove_hierarchy: path {0} is protected'.format(
sub_path
)
)
return
Command.run(
['rmdir', '--ignore-fail-on-non-empty', sub_path]
)
return
Command.run(
['rmdir', '--ignore-fail-on-non-empty', sub_path]
)
@classmethod
def which(