external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-11 01:27:17 +00:00
Code Issues Releases Wiki Activity

Output message about ignoring errors

Browse Source
This commit is contained in:
downtownallday 2022-06-22 11:19:33 -04:00
parent e710d3212f
commit 8e6e4480b2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/lib/carddav.sh
View File

@ -247,9 +247,7 @@ roundcube_force_carddav_refresh() {
[ -z "$carddav_major" ] && carddav_major="3" [ -z "$carddav_major" ] && carddav_major="3"
if [ $carddav_major -eq 3 ]; then if [ $carddav_major -eq 3 ]; then
if [ ! -e "$RCM_DIR/bin/carddav_refresh.sh" ]; then # old version
echo "Please ignore the following errors about no such table carddav_addressbooks and carddav_migrations"
fi
sync_script="$assets_dir/mail/roundcube/carddav_refresh_v3.sh" sync_script="$assets_dir/mail/roundcube/carddav_refresh_v3.sh"
else else
sync_script="$assets_dir/mail/roundcube/carddav_refresh.sh" sync_script="$assets_dir/mail/roundcube/carddav_refresh.sh"
@ -261,6 +259,7 @@ roundcube_force_carddav_refresh() {
fi fi
pushd "$RCM_DIR" >/dev/null pushd "$RCM_DIR" >/dev/null
echo "Please ignore errors about 'no such table carddav_addressbooks' and 'no such table carddav_migrations'"
bin/carddav_refresh.sh "$user" "$pass" bin/carddav_refresh.sh "$user" "$pass"
code=$? code=$?
popd >/dev/null popd >/dev/null