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

[unpackfs] Remove unused parameter

Browse Source 
- list_excludes() turns the extra mounts from global storage
   into --exclude parameters for rsync; it doesn't do anything
   with the destination parameter.
 - while here rename to something more descriptive
This commit is contained in:
Adriaan de Groot 2019-10-11 16:46:21 +02:00
parent fe1ddb8ead
commit 311c65737f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,12 +76,9 @@ class UnpackEntry:
ON_POSIX = 'posix' in sys.builtin_module_names ON_POSIX = 'posix' in sys.builtin_module_names
def list_excludes(destination): def global_excludes():
""" """
List excludes for rsync. List excludes for rsync.
:param destination:
:return:
""" """
lst = [] lst = []
extra_mounts = globalstorage.value("extraMounts") extra_mounts = globalstorage.value("extraMounts")
@ -120,7 +117,7 @@ def file_copy(source, dest, progress_cb):
num_files_copied = 0 # Gets updated through rsync output num_files_copied = 0 # Gets updated through rsync output
args = ['rsync', '-aHAXr'] args = ['rsync', '-aHAXr']
args.extend(list_excludes(dest)) args.extend(global_excludes())
args.extend(['--progress', source, dest]) args.extend(['--progress', source, dest])
process = subprocess.Popen( process = subprocess.Popen(
args, env=at_env, bufsize=1, stdout=subprocess.PIPE, close_fds=ON_POSIX args, env=at_env, bufsize=1, stdout=subprocess.PIPE, close_fds=ON_POSIX