[WIP] What happens if a merge would override a fil
AbandonedPublic

Authored by vonreth on Jan 3 2020, 11:18 AM.

Details

Diff Detail

Repository
R138 Craft
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 20570
Build 20588: arc lint + arc unit
vonreth requested review of this revision.Jan 3 2020, 11:18 AM
vonreth created this revision.

Hi what would be the correct behaviour here? Actually I think we would need to fail and in case of the mac packager extend the blacklist.
The path lashing here are from p1kit.
We merge both bin/ and lib/libexec/ into the bundle.

craft --print-files p11kit 
Craft               : /Users/hannah/CraftRoot
Version             : master
ABI                 : macos-64-clang
Download directory  : /Users/hannah/CraftRoot/download
bin/p11-kit
bin/p11-kit.dSYM/Contents/Info.plist
bin/p11-kit.dSYM/Contents/Resources/DWARF/p11-kit
bin/trust
bin/trust.dSYM/Contents/Info.plist
bin/trust.dSYM/Contents/Resources/DWARF/trust
etc/pkcs11/pkcs11.conf.example
include/p11-kit-1/p11-kit/deprecated.h
include/p11-kit-1/p11-kit/iter.h
include/p11-kit-1/p11-kit/p11-kit.h
include/p11-kit-1/p11-kit/pin.h
include/p11-kit-1/p11-kit/pkcs11.h
include/p11-kit-1/p11-kit/pkcs11x.h
include/p11-kit-1/p11-kit/remote.h
include/p11-kit-1/p11-kit/uri.h
lib/libp11-kit.0.dylib
lib/libp11-kit.0.dylib.dSYM/Contents/Info.plist
lib/libp11-kit.0.dylib.dSYM/Contents/Resources/DWARF/libp11-kit.0.dylib
lib/libp11-kit.dylib
lib/p11-kit-proxy.dylib
lib/pkcs11/p11-kit-client.so
lib/pkcs11/p11-kit-client.so.dSYM/Contents/Info.plist
lib/pkcs11/p11-kit-client.so.dSYM/Contents/Resources/DWARF/p11-kit-client.so
lib/pkcs11/p11-kit-trust.so
lib/pkcs11/p11-kit-trust.so.dSYM/Contents/Info.plist
lib/pkcs11/p11-kit-trust.so.dSYM/Contents/Resources/DWARF/p11-kit-trust.so
lib/pkgconfig/p11-kit-1.pc
libexec/p11-kit/p11-kit-remote
libexec/p11-kit/p11-kit-remote.dSYM/Contents/Info.plist
libexec/p11-kit/p11-kit-remote.dSYM/Contents/Resources/DWARF/p11-kit-remote
libexec/p11-kit/p11-kit-server
libexec/p11-kit/p11-kit-server.dSYM/Contents/Info.plist
libexec/p11-kit/p11-kit-server.dSYM/Contents/Resources/DWARF/p11-kit-server
libexec/p11-kit/trust-extract-compat
share/p11-kit/modules/p11-kit-trust.module

If merging would clash then it's the recipe/package maintainer to clarify merging rules.
So yeah, by example by blacklisting some files.