jegomez/odoo14-dev-environment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[FIX] Uses patch instead of git for OCA patches

Browse Source
This commit is contained in:
Jorge Enrique Gómez Gómez 2023-03-16 22:14:53 -05:00
parent feb46f446d
commit 77bbd29faf
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apply_patches.sh
View File

@ -98,6 +98,8 @@ pt_community ()
echo " Patch OCA modules" echo " Patch OCA modules"
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
# Note: git apply has issues with submodules. Use patch command instead.
DEST=$DESTDIR/community/base_location/ DEST=$DESTDIR/community/base_location/
OPTIONS="--directory=$DEST --strip=1" OPTIONS="--directory=$DEST --strip=1"
patch $OPTIONS < patches/20210821_base-location_no-zip-from-city.patch patch $OPTIONS < patches/20210821_base-location_no-zip-from-city.patch
@ -106,14 +108,9 @@ pt_community ()
OPTIONS="--directory=$DEST --strip=1" OPTIONS="--directory=$DEST --strip=1"
patch $OPTIONS < patches/20210420_auth-oauth-multi-token_error-in-login.patch patch $OPTIONS < patches/20210420_auth-oauth-multi-token_error-in-login.patch
SRC=$PWD DEST=$DESTDIR/community/account_invoice_force_number/
DEST=$DESTDIR/community/ OPTIONS="--directory=$DEST --strip=1"
OPTIONS="-p1 --verbose" patch $OPTIONS < patches/20211216_account-invoice-force-number_post-instead-of-action.patch
pushd $DEST
git apply $OPTIONS $SRC/patches/20211216_account-invoice-force-number_post-instead-of-action.patch
popd
} }
pt_all () pt_all ()