[FIX] Uses patch instead of git for OCA patches
This commit is contained in:
parent
feb46f446d
commit
77bbd29faf
@ -98,6 +98,8 @@ pt_community ()
|
||||
echo " Patch OCA modules"
|
||||
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
||||
|
||||
# Note: git apply has issues with submodules. Use patch command instead.
|
||||
|
||||
DEST=$DESTDIR/community/base_location/
|
||||
OPTIONS="--directory=$DEST --strip=1"
|
||||
patch $OPTIONS < patches/20210821_base-location_no-zip-from-city.patch
|
||||
@ -106,14 +108,9 @@ pt_community ()
|
||||
OPTIONS="--directory=$DEST --strip=1"
|
||||
patch $OPTIONS < patches/20210420_auth-oauth-multi-token_error-in-login.patch
|
||||
|
||||
SRC=$PWD
|
||||
DEST=$DESTDIR/community/
|
||||
OPTIONS="-p1 --verbose"
|
||||
|
||||
pushd $DEST
|
||||
git apply $OPTIONS $SRC/patches/20211216_account-invoice-force-number_post-instead-of-action.patch
|
||||
popd
|
||||
|
||||
DEST=$DESTDIR/community/account_invoice_force_number/
|
||||
OPTIONS="--directory=$DEST --strip=1"
|
||||
patch $OPTIONS < patches/20211216_account-invoice-force-number_post-instead-of-action.patch
|
||||
}
|
||||
|
||||
pt_all ()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user