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

[unpackfs] Put exclusion settings into the rsync command line

Browse Source
This commit is contained in:
Adriaan de Groot 2019-10-11 17:46:01 +02:00
parent 9d47716e5d
commit 4370669fc3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,6 +123,11 @@ def file_copy(source, entry, progress_cb):
args = ['rsync', '-aHAXr'] args = ['rsync', '-aHAXr']
args.extend(global_excludes()) args.extend(global_excludes())
if entry.excludeFile:
args.extend(["--exclude-from=" + entry.excludeFile])
if entry.exclude:
for f in entry.exclude:
args.extend(["--exclude", f])
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

5
src/modules/unpackfs/unpackfs.conf
View File

@ -82,7 +82,8 @@ unpack:
- source: ../CHANGES - source: ../CHANGES
sourcefs: file sourcefs: file
destination: "/tmp/changes.txt" destination: "/tmp/changes.txt"
- source: src/qml/calamares/slideshow/ - source: src/qml/calamares/slideshow
sourcefs: file sourcefs: file
destination: "/tmp/" destination: "/tmp/slideshow/"
exclude: [ "*.qmlc", "qmldir" ] exclude: [ "*.qmlc", "qmldir" ]
# excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt