napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[unpackfs] Re-jig process-return-value in Python

Browse Source 
- make the installation work,
- special case because rsync can return error 23 (which throws, from
  inside the Python API) which still means "it was ok".
This commit is contained in:
Adriaan de Groot 2021-11-05 16:52:18 +01:00
parent c79bb3cd10
commit 6130a9c51f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/unpackfs/main.py
View File

@ -227,7 +227,11 @@ def file_copy(source, entry, progress_cb):
counter.last_total_reported = num_files_total_local counter.last_total_reported = num_files_total_local
progress_cb(num_files_copied, num_files_total_local) progress_cb(num_files_copied, num_files_total_local)
libcalamares.utils.host_env_process_output(args, output_cb) try:
returncode = libcalamares.utils.host_env_process_output(args, output_cb)
except subprocess.CalledProcessError as e:
returncode = e.returncode
progress_cb(counter.last_num_files_copied, counter.last_total_reported) # Push towards 100% progress_cb(counter.last_num_files_copied, counter.last_total_reported) # Push towards 100%
# Mark this entry as really done # Mark this entry as really done
@ -245,9 +249,9 @@ def file_copy(source, entry, progress_cb):
# have to do. See also: # have to do. See also:
# https://bugzilla.redhat.com/show_bug.cgi?id=868755#c50 # https://bugzilla.redhat.com/show_bug.cgi?id=868755#c50
# for the same issue in Anaconda, which uses a similar workaround. # for the same issue in Anaconda, which uses a similar workaround.
if process.returncode != 0 and process.returncode != 23: if returncode != 0 and returncode != 23:
libcalamares.utils.warning("rsync failed with error code {}.".format(process.returncode)) libcalamares.utils.warning("rsync failed with error code {}.".format(returncode))
return _("rsync failed with error code {}.").format(process.returncode) return _("rsync failed with error code {}.").format(returncode)
return None return None